zugpferd 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97af66296e92817aef2f4f2fbea2e0ebb7170fb3856732a552ac32210a8e085f
-  data.tar.gz: cc23dea33a361b6fcfc93a52c0928a70bea18757cb2e022dbf123b142480383a
+  metadata.gz: 05fc84848e61ccfc901d5a22ab7d35ff8032531d543dcd85883073a7d0bd2c43
+  data.tar.gz: cd37bf998f94dd2be0f9adac19761976145b49f7aace4d22d5af2812df173e1a
 SHA512:
-  metadata.gz: 79479ce622f08767f6ac5d3d63b5826ca3a3eef621d768005c417600f16b308856280e270a7188f49a03b3ff25f03ec0b169861570cde588fc72005d64a96b92
-  data.tar.gz: 31d343e25f7d8c5e9d2eb459f941b5a0f67d38169e8f264f66100382e8d11ace7e5f2bfb79497d5d0dbbf6f2097965078f7b9fd2ffb0903ae1a56c3c622bdc53
+  metadata.gz: 245cb66ea6b7b151145130747873780113acd36790a66420e23b210ddd1920082e22bd50661cadde218bf15bc1713687ddbc0b5a802bfd0245aa6b72b569fe7c
+  data.tar.gz: 72af5d37db91aaa59deee1cc9b9ec7aa70347d1dce1f87decc6f5347f5714a077d869533f4bcb23d9bb42b4b52b6db73157904c987c98144c5a888616d7f5f24

data/lib/zugpferd/cii/mapping.rb

@@ -26,6 +26,8 @@ module Zugpferd
       # Delivery (BG-13)
       DELIVERY = "#{TRANSACTION}/ram:ApplicableHeaderTradeDelivery"
       DELIVERY_DATE = "ram:ActualDeliverySupplyChainEvent/ram:OccurrenceDateTime/udt:DateTimeString"
+      # Deliver to address (BG-15), fields as in ADDRESS
+      DELIVER_TO_ADDRESS = "ram:ShipToTradeParty/ram:PostalTradeAddress"
 
       # Settlement (contains currency, payment, tax, totals)
       SETTLEMENT = "#{TRANSACTION}/ram:ApplicableHeaderTradeSettlement"

data/lib/zugpferd/cii/reader.rb

@@ -49,6 +49,7 @@ module Zugpferd
           issue_date: parse_cii_date(text(root, INVOICE[:issue_date])),
           due_date: parse_cii_date(settlement ? text(settlement, PAYMENT_TERMS_DUE_DATE) : nil),
           delivery_date: parse_cii_date(delivery ? text(delivery, DELIVERY_DATE) : nil),
+          deliver_to_address: build_deliver_to_address(delivery),
           invoicing_period_start_date: parse_cii_date(period ? text(period, BILLING_PERIOD_FIELDS[:start_date]) : nil),
           invoicing_period_end_date: parse_cii_date(period ? text(period, BILLING_PERIOD_FIELDS[:end_date]) : nil),
           type_code: text(root, INVOICE[:type_code]),
@@ -105,6 +106,11 @@ module Zugpferd
         )
       end
 
+      def build_deliver_to_address(delivery_node)
+        addr_node = delivery_node&.at_xpath(DELIVER_TO_ADDRESS, NS)
+        build_postal_address(addr_node) if addr_node
+      end
+
       def build_contact(node)
         Model::Contact.new(
           name: text(node, CONTACT_FIELDS[:name]),

data/lib/zugpferd/cii/writer.rb

@@ -157,6 +157,11 @@ module Zugpferd
 
       def build_delivery(xml, doc)
         xml["ram"].ApplicableHeaderTradeDelivery do
+          if doc.deliver_to_address
+            xml["ram"].ShipToTradeParty do
+              build_postal_address(xml, doc.deliver_to_address)
+            end
+          end
           if doc.delivery_date
             xml["ram"].ActualDeliverySupplyChainEvent do
               xml["ram"].OccurrenceDateTime do

data/lib/zugpferd/model/billing_document.rb

@@ -19,6 +19,7 @@ module Zugpferd
       # @return [String] BT-3 Invoice type code
       # @return [String] BT-5 Document currency code (default: "EUR")
       # @return [Date, nil] BT-72 Actual delivery date
+      # @return [PostalAddress, nil] BG-15 Deliver to address
       # @return [Array<PrecedingInvoice>] BG-3 Preceding invoice references
       # @return [Date, nil] BT-73 Invoicing period start date
       # @return [Date, nil] BT-74 Invoicing period end date
@@ -35,7 +36,7 @@ module Zugpferd
       # @return [PaymentInstructions, nil] BG-16 Payment information
       # @return [Array<AllowanceCharge>] BG-20/BG-21 Document-level allowances and charges
       attr_accessor :number, :issue_date, :due_date, :type_code,
-                    :currency_code, :delivery_date,
+                    :currency_code, :delivery_date, :deliver_to_address,
                     :invoicing_period_start_date, :invoicing_period_end_date,
                     :buyer_reference, :purchase_order_reference,
                     :customization_id, :profile_id, :note, :seller, :buyer,

data/lib/zugpferd/model/postal_address.rb

@@ -1,14 +1,14 @@
 module Zugpferd
   module Model
-    # Postal address (BG-5 / BG-8).
+    # Postal address (BG-5 / BG-8 / BG-15).
     class PostalAddress
-      # @return [String, nil] BT-35/BT-50 Street name
-      # @return [String, nil] BT-37/BT-52 City name
-      # @return [String, nil] BT-38/BT-53 Postal zone
-      # @return [String] BT-40/BT-55 Country code
+      # @return [String, nil] BT-35/BT-50/BT-75 Street name
+      # @return [String, nil] BT-37/BT-52/BT-77 City name
+      # @return [String, nil] BT-38/BT-53/BT-78 Postal zone
+      # @return [String] BT-40/BT-55/BT-80 Country code
       attr_accessor :street_name, :city_name, :postal_zone, :country_code
 
-      # @param country_code [String] BT-40/BT-55 Country code (ISO 3166-1 alpha-2)
+      # @param country_code [String] BT-40/BT-55/BT-80 Country code (ISO 3166-1 alpha-2)
       # @param rest [Hash] additional attributes set via accessors
       def initialize(country_code:, **rest)
         @country_code = country_code

data/lib/zugpferd/ubl/mapping.rb

@@ -32,6 +32,8 @@ module Zugpferd
       # Delivery (BG-13)
       DELIVERY = "cac:Delivery"
       DELIVERY_DATE = "cbc:ActualDeliveryDate"
+      # Deliver to address (BG-15), fields as in ADDRESS
+      DELIVER_TO_ADDRESS = "cac:DeliveryLocation/cac:Address"
 
       # Invoicing period (BG-14)
       INVOICE_PERIOD = "cac:InvoicePeriod"

data/lib/zugpferd/ubl/reader.rb

@@ -42,6 +42,7 @@ module Zugpferd
           issue_date: parse_date(text(root, INVOICE[:issue_date])),
           due_date: parse_date(text(root, due_date_element)),
           delivery_date: delivery_node ? parse_date(text(delivery_node, DELIVERY_DATE)) : nil,
+          deliver_to_address: build_deliver_to_address(delivery_node),
           invoicing_period_start_date: period_node ? parse_date(text(period_node, INVOICE_PERIOD_FIELDS[:start_date])) : nil,
           invoicing_period_end_date: period_node ? parse_date(text(period_node, INVOICE_PERIOD_FIELDS[:end_date])) : nil,
           type_code: text(root, type_code_element),
@@ -98,6 +99,11 @@ module Zugpferd
         )
       end
 
+      def build_deliver_to_address(delivery_node)
+        addr_node = delivery_node&.at_xpath(DELIVER_TO_ADDRESS, @ns)
+        build_postal_address(addr_node) if addr_node
+      end
+
       def build_contact(node)
         Model::Contact.new(
           name: text(node, CONTACT_FIELDS[:name]),

data/lib/zugpferd/ubl/writer.rb

@@ -56,7 +56,7 @@ module Zugpferd
 
         build_supplier(xml, doc.seller, doc.payment_instructions) if doc.seller
         build_customer(xml, doc.buyer) if doc.buyer
-        build_delivery(xml, doc) if doc.delivery_date
+        build_delivery(xml, doc) if doc.delivery_date || doc.deliver_to_address
         build_payment_means(xml, doc.payment_instructions, doc.due_date) if doc.payment_instructions
         build_payment_terms(xml, doc.payment_instructions) if doc.payment_instructions&.note
         doc.allowance_charges.each { |ac| build_allowance_charge(xml, ac, doc.currency_code) }
@@ -137,12 +137,16 @@ module Zugpferd
 
       def build_postal_address(xml, addr)
         xml["cac"].PostalAddress do
-          xml["cbc"].StreetName addr.street_name if addr.street_name
-          xml["cbc"].CityName addr.city_name if addr.city_name
-          xml["cbc"].PostalZone addr.postal_zone if addr.postal_zone
-          xml["cac"].Country do
-            xml["cbc"].IdentificationCode addr.country_code
-          end
+          build_address_fields(xml, addr)
+        end
+      end
+
+      def build_address_fields(xml, addr)
+        xml["cbc"].StreetName addr.street_name if addr.street_name
+        xml["cbc"].CityName addr.city_name if addr.city_name
+        xml["cbc"].PostalZone addr.postal_zone if addr.postal_zone
+        xml["cac"].Country do
+          xml["cbc"].IdentificationCode addr.country_code
         end
       end
 
@@ -178,7 +182,14 @@ module Zugpferd
 
       def build_delivery(xml, doc)
         xml["cac"].Delivery do
-          xml["cbc"].ActualDeliveryDate doc.delivery_date.to_s
+          xml["cbc"].ActualDeliveryDate doc.delivery_date.to_s if doc.delivery_date
+          if doc.deliver_to_address
+            xml["cac"].DeliveryLocation do
+              xml["cac"].Address do
+                build_address_fields(xml, doc.deliver_to_address)
+              end
+            end
+          end
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zugpferd
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Alexander Zeitler