secretariat 3.5.0 → 3.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 101180b4e01b5fab64b9362975b172d91ecebf1926f22d9128339f8c1599084e
-  data.tar.gz: '0795397ea1963f7f8de510bafc929b5590ff52586b1f96b0a8e3b77ec01b1867'
+  metadata.gz: 7614825461a1901faaa9bd3e72fc6fdbde345acc68fdfff7c7649d5e9af56bd5
+  data.tar.gz: 73ec613205ee0a40046c521baec838c4f2eb1fcbd15f12fccd0ec35d21071811
 SHA512:
-  metadata.gz: f21836d1199fd2d1bcf36eb7bda5c2bfcdfc73154e0281200002d5b19bd30ef07c4b5d7b18a400f978637ada150fe7a95efec9623e71267dbbe3cfc7d230d6c9
-  data.tar.gz: d5e574f2a06c3cf7f929b045a58c60867e7986a2f451484aee5ac4cf7185cdae36fc1fd0890a941ef2c330362544043d93a5561a906d09a32d55104c6c10ef83
+  metadata.gz: 3ffff8d3135aae3aab1d2c71737b1bc80ce588748c3b3350218629673c1295126f9bcdbd17986c2da6f78a5f4bb51493df85bb32ec2bd3ebf16a7bd692200172
+  data.tar.gz: 84ae46ef3f826f9af23ff62c4e8484bc003cb8e665d3edbb5c55468d8782d445d35b82afc892679cd6effa4782ed4178471902287267896fb33770c6b708ea9a

data/lib/secretariat/invoice.rb

@@ -17,6 +17,8 @@ limitations under the License.
 require 'bigdecimal'
 
 module Secretariat
+  using ObjectExtensions
+  
   Invoice = Struct.new("Invoice",
     :id,
     :issue_date,
@@ -33,6 +35,8 @@ module Secretariat
     :payment_terms_text,
     :payment_due_date,
     :payment_iban,
+    :payment_bic,
+    :payment_payee_account_name,
     :tax_category,
     :tax_percent,
     :tax_amount,
@@ -42,6 +46,7 @@ module Secretariat
     :due_amount,
     :paid_amount,
     :tax_calculation_method,
+    :notes,
     :attachments,
     keyword_init: true
   ) do
@@ -84,7 +89,7 @@ module Secretariat
           taxes[line_item.tax_percent].base_amount += BigDecimal(line_item.net_amount) * line_item.quantity
         end
       end
-      
+
       if tax_calculation_method == :VERTICAL
         taxes.values.map do |tax|
           tax.tax_amount = (tax.base_amount * tax.tax_percent / 100).round(2)
@@ -200,8 +205,13 @@ module Secretariat
                 xml.text(issue_date.strftime("%Y%m%d"))
               end
             end
-
+            Array(self.notes).each do |note|
+              xml['ram'].IncludedNote do
+                xml['ram'].Content note
+              end
+            end
           end
+
           transaction = by_version(version, 'SpecifiedSupplyChainTradeTransaction', 'SupplyChainTradeTransaction')
           xml['rsm'].send(transaction) do
 
@@ -250,16 +260,22 @@ module Secretariat
             end
             trade_settlement = by_version(version, 'ApplicableSupplyChainTradeSettlement', 'ApplicableHeaderTradeSettlement')
             xml['ram'].send(trade_settlement) do
-              if payment_reference && payment_reference != ''
+              if payment_reference.present?
                 xml['ram'].PaymentReference payment_reference
               end
               xml['ram'].InvoiceCurrencyCode currency_code
               xml['ram'].SpecifiedTradeSettlementPaymentMeans do
                 xml['ram'].TypeCode payment_code
                 xml['ram'].Information payment_text
-                if payment_iban
+                if payment_iban || payment_payee_account_name
                   xml['ram'].PayeePartyCreditorFinancialAccount do
-                    xml['ram'].IBANID payment_iban
+                    xml['ram'].IBANID payment_iban if payment_iban
+                    xml['ram'].AccountName payment_payee_account_name if payment_payee_account_name
+                  end
+                end
+                if payment_bic
+                  xml['ram'].PayeeSpecifiedCreditorFinancialInstitution do
+                    xml['ram'].BICID payment_bic
                   end
                 end
               end
@@ -267,7 +283,7 @@ module Secretariat
                 xml['ram'].ApplicableTradeTax do
                   Helpers.currency_element(xml, 'ram', 'CalculatedAmount', tax.tax_amount, currency_code, add_currency: version == 1)
                   xml['ram'].TypeCode 'VAT'
-                  if tax_reason_text && tax_reason_text != ''
+                  if tax_reason_text.present?
                     xml['ram'].ExemptionReason tax_reason_text
                   end
                   Helpers.currency_element(xml, 'ram', 'BasisAmount', tax.base_amount, currency_code, add_currency: version == 1)

data/lib/secretariat/object_extensions.rb

@@ -0,0 +1,14 @@
+module Secretariat
+  module ObjectExtensions
+    refine Object do
+      # Copied from activesupport/lib/active_support/core_ext/object/blank.rb, line 18
+      def blank?
+        respond_to?(:empty?) ? !!empty? : !self
+      end
+
+      def present?
+        !blank?
+      end
+    end
+  end
+end

data/lib/secretariat/trade_party.rb

@@ -15,12 +15,14 @@ limitations under the License.
 =end
 
 module Secretariat
+  using ObjectExtensions
+  
   TradeParty = Struct.new('TradeParty',
     :name, :street1, :street2, :city, :postal_code, :country_id, :vat_id, :global_id, :global_id_scheme_id, :tax_id,
     keyword_init: true,
   ) do
     def to_xml(xml, exclude_tax: false, version: 2)
-      if global_id && global_id != '' && global_id_scheme_id && global_id_scheme_id != ''
+      if global_id.present? && global_id_scheme_id.present?
         xml['ram'].GlobalID(schemeID: global_id_scheme_id) do
           xml.text(global_id)
         end
@@ -29,19 +31,19 @@ module Secretariat
       xml['ram'].PostalTradeAddress do
         xml['ram'].PostcodeCode postal_code
         xml['ram'].LineOne street1
-        if street2 && street2 != ''
+        if street2.present?
           xml['ram'].LineTwo street2
         end
         xml['ram'].CityName city
         xml['ram'].CountryID country_id
       end
-      if !exclude_tax && vat_id && vat_id != ''
+      if !exclude_tax && vat_id.present?
         xml['ram'].SpecifiedTaxRegistration do
           xml['ram'].ID(schemeID: 'VA') do
             xml.text(vat_id)
           end
         end
-      elsif tax_id && tax_id != ''
+      elsif tax_id.present?
         xml['ram'].SpecifiedTaxRegistration do
           xml['ram'].ID(schemeID: 'FC') do
             xml.text(tax_id)

data/lib/secretariat/version.rb

@@ -15,5 +15,5 @@ limitations under the License.
 =end
 
 module Secretariat
-  VERSION = '3.5.0'
+  VERSION = "3.7.0"
 end

data/lib/secretariat.rb

@@ -15,6 +15,7 @@ limitations under the License.
 =end
 
 require_relative 'secretariat/version'
+require_relative 'secretariat/object_extensions'
 require_relative 'secretariat/constants'
 require_relative 'secretariat/helpers'
 require_relative 'secretariat/versioner'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: secretariat
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.7.0
 platform: ruby
 authors:
 - Jan Krutisch
@@ -43,14 +43,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '3.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: '3.6'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +107,7 @@ files:
 - lib/secretariat/helpers.rb
 - lib/secretariat/invoice.rb
 - lib/secretariat/line_item.rb
+- lib/secretariat/object_extensions.rb
 - lib/secretariat/tax.rb
 - lib/secretariat/trade_party.rb
 - lib/secretariat/validation_error.rb