einvoice 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acb60f52705f36d1c87dfa4105a8a7f926128d2d8ff86e95e061f26858d60326
-  data.tar.gz: 711d1697ff99ff5930d30582a92667c4d5187f65db1ac22ee435e0c5eca4e0a5
+  metadata.gz: 5e67b4a1d7f59b394250f8295a9f8d6ce6cdc317889fc0da6187593e5bfbd2ce
+  data.tar.gz: c629f5f2ff8090e2eaf8adb9b17510846c7cd14bf11c4d5281e49cdb15ec69f0
 SHA512:
-  metadata.gz: 23882b1e0f706af6a84f14ca9c584c709e799bc848772c2fdda5414e34a36743fbd35b97badedcacebeb7253eebe4dbdc7fecd5ce8042bc03508c5c524545d9b
-  data.tar.gz: fc018cbf750ce248c52d9ffb734ebd94f709046cafd4975b4da99e392344c543e7bf1b8539a0629504c4e2220a2d9ed1e68f4e9cbdfa6ee2565cf0823c7efc60
+  metadata.gz: eba328d0b736a2bf1f563d7c5f67f2cb91eee0638fdbfb086b5a0f566037d0882b4e52914fef5570e148dc288a023eeb3bf9bf1331e40a64cc103427e7e8ad35
+  data.tar.gz: 3f8936270bb7164651fae848cdc4cafafaac67a4d63a39aed89432bb2201010d3b3f24f028b0fb533552d0592515f91f1fa15802125a2a7479f9f7550353cca4

data/einvoice.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "factory_girl"
+  spec.add_development_dependency "factory_bot"
   spec.add_development_dependency "shoulda-matchers"
   spec.add_development_dependency "vcr"
   spec.add_development_dependency "webmock"

data/lib/einvoice/tradevan/model/issue_data.rb

@@ -8,6 +8,7 @@ module Einvoice
           :orgUn,
           :type,
           :saleIdentifier,
+          :allowanceIdentifier,
           :transactionNumber,
           :transactionDate,
           :transactionTime,
@@ -20,9 +21,10 @@ module Einvoice
           :allowanceExclusiveAmount,
           :allowanceTax,
           :allowancePaperReturned,
+          :allowanceInclusiveAmount,
           :paperPrintMode,
           :invoiceAlarmMode,
-          :InvoicePaperReturned,
+          :invoicePaperReturned,
           :donate,
           :donationUnit,
           :carrierType,
@@ -35,6 +37,7 @@ module Einvoice
           :receiverAddrRoad,
           :receiverEmail,
           :receiverMobile,
+          :allowaDeclaration,
           :idViewId,
           :memberId,
           :checkNumber,
@@ -54,44 +57,58 @@ module Einvoice
         validates :companyUn, presence: true, length: { is: 8 }
         validates :orgId, presence: true, length: { is: 5 }
         validates :orgUn, length: { is: 8 }, allow_blank: true
-        validates :type, presence: true, length: { is: 1 }, inclusion: { in: %w(I R G H) }
-        validates :saleIdentifier, presence: true, length: { maximum: 100 }, saleIdentifier: true
+        validates :type, presence: true, length: { is: 1 }, inclusion: { in: %w(I R G H A) }
         validates :transactionNumber, presence: true, length: { maximum: 50 }
         validates :transactionDate, presence: true, length: { is: 8 }, format: { with: /\A\d{8}\Z/ }
-        validates :transactionTime, presence: true, length: { is: 8 }, format: { with: /\A\d{2}\:\d{2}\:\d{2}\Z/ }
-        validates :total, presence: true, length: { maximum: 20 }, total: true
         validates :transactionSource, length: { maximum: 50 } # Public Affair Firm presence: true
         validates :transactionTarget, length: { maximum: 50 } # Public Affair Firm presence: true
         validates :paperPrintMode, presence: true, length: { is: 1 }, inclusion: { in: %w(0 1 2 3 4) }
         validates :invoiceAlarmMode, presence: true, length: { is: 1 }, inclusion: { in: %w(0 1 2 3 4 5 6) }
-        validates :InvoicePaperReturned, allow_blank: true, length: { maximum: 1 }, inclusion: { in: %w(Y N) }, InvoicePaperReturned: true
-        validates :carrierType, presence: true, length: { is: 6 }, if: proc { self.paperPrintMode.to_i == 0 && self.donate == 'N' }
-        validates :buyerUn, length: { is: 8 }, allow_blank: true
-        validates :buyerTitle, length: { maximum: 60 }, allow_blank: true
+        validates :invoicePaperReturned, presence: true, length: { maximum: 1 }, inclusion: { in: %w(Y N) }, invoicePaperReturned: true, if: proc { self.type == 'A' || (self.buyerUn.blank? && self.paperPrintMode.to_i != 0) }
+        validates :carrierType, presence: true, length: { is: 6 }, if: proc { self.paperPrintMode.to_i == 0 && self.donate == 'N' && self.type != 'A' }
+        validates :buyerUn, length: { is: 8 }, allow_blank: true, unless: proc { %w(A H).include?(self.type) }
+        validates :buyerTitle, length: { maximum: 60 }, allow_blank: true, unless: proc { %w(A H).include?(self.type) }
         validates :idViewId, allow_blank: true, length: { maximum: 10 }
         validates :memberId, allow_blank: true, length: { maximum: 50 }
         validates :itemList, presence: true, itemList: true
 
+        # Type I R G H
+        validates :saleIdentifier, presence: true, length: { maximum: 100 }, saleIdentifier: true, if: proc { %w(I R G H).include?(self.type) }
+
+        # Type A H
+        validates :allowanceIdentifier, presence: true, length: { maximum: 100 }, allowanceIdentifier: true, if: proc { %w(A H).include?(self.type) }
+        validates :allowanceExclusiveAmount, presence: true, length: { maximum: 20 }, if: proc { %w(A H).include?(self.type) }
+        validates :allowanceTax, presence: true, length: { maximum: 8 }, if: proc { %w(A H).include?(self.type) }
+        validates :allowancePaperReturned, presence: true, length: { is: 1 }, inclusion: { in: %w(Y N) }, if: proc { %w(A H).include?(self.type) }
+        validates :allowanceInclusiveAmount, presence: true, length: { maximum: 20 }, if: proc { %w(A H).include?(self.type) }
+
         # Type R G H
         validates :invoiceNumber, presence: true, length: { is: 10 }, if: proc { %w(R G H).include?(self.type) }
 
         # Type H
         validates :allowanceNumber, presence: true, length: { is: 16 }, allowanceNumber: true, if: proc { self.type == 'H' }
         validates :allowanceDate, presence: true, length: { is: 8 }, format: { with: /\A\d{8}\Z/ }, if: proc { self.type == 'H' }
-        validates :allowanceExclusiveAmount, presence: true, length: { maximum: 20 }, if: proc { self.type == 'H' }
-        validates :allowanceTax, presence: true, length: { maximum: 8 }, if: proc { self.type == 'H' }
-        validates :allowancePaperReturned, presence: true, length: { is: 1 }, inclusion: { in: %w(Y N) }, if: proc { self.type == 'H' }
+
+        # Type A
+        validates :allowaDeclaration, allow_blank: true, length: { is: 6 }, format: { with: /\A\d{6}\Z/ }, if: proc { self.type == 'A' }
 
         # Type I R G
+        validates :transactionTime, presence: true, length: { is: 8 }, format: { with: /\A\d{2}\:\d{2}\:\d{2}\Z/ }, if: proc { %w(I R G).include?(self.type) }
+        validates :total, presence: true, length: { maximum: 20 }, total: true, if: proc { %w(I R G).include?(self.type) }
         validates :donate, presence: true, length: { is: 1 }, if: proc { %w(I R G).include?(self.type) && self.buyerUn.blank? && self.paperPrintMode.to_i == 0 }
         validates :donationUnit, presence: true, length: { maximum: 10 }, donationUnit: true, if: proc { %w(I R G).include?(self.type) && self.donate == 'Y' }
         validates :carrierId, presence: true, length: { maximum: 64 }, if: proc { %w(I R G).include?(self.type) && self.paperPrintMode.to_i == 0 && self.donate == 'N' }
         validates :carrierIdHidden, presence: true, length: { maximum: 64 }, if: proc { %w(I R G).include?(self.type) && self.paperPrintMode.to_i == 0 && self.donate == 'N' }
-        validates :receiverName, allow_blank: true, length: { maximum: 30 }, if: proc { %w(I R G).include?(self.type) }
-        validates :receiverAddrZip, allow_blank: true, length: { maximum: 5 }, if: proc { %w(I R G).include?(self.type) }
-        validates :receiverAddrRoad, allow_blank: true, length: { maximum: 100 }, if: proc { %w(I R G).include?(self.type) }
-        validates :receiverEmail, allow_blank: true, length: { maximum: 80 }, if: proc { %w(I R G).include?(self.type) }
-        validates :receiverMobile, allow_blank: true, length: { maximum: 15 }, if: proc { %w(I R G).include?(self.type) }
+
+        # Type I R G A
+        validates :receiverName, allow_blank: true, length: { maximum: 30 }, if: proc { %w(I R G A).include?(self.type) }
+        validates :receiverAddrZip, allow_blank: true, length: { maximum: 5 }, if: proc { %w(I R G A).include?(self.type) }
+        validates :receiverAddrRoad, allow_blank: true, length: { maximum: 100 }, if: proc { %w(I R G A).include?(self.type) }
+        validates :receiverEmail, allow_blank: true, length: { maximum: 80 }, if: proc { %w(I R G A).include?(self.type) }
+        validates :receiverMobile, allow_blank: true, length: { maximum: 15 }, if: proc { %w(I R G A).include?(self.type) }
+
+        # Type I G
+        validates :tax, allow_blank: true, length: { maximum: 20 }, if: proc { %w(I G).include?(self.type) }
 
         # Type G
         validates :checkNumber, allow_blank: true, length: { is: 4 }, if: proc { self.type == 'G' }
@@ -100,7 +117,6 @@ module Einvoice
         validates :texclusiveAmount, allow_blank: true, length: { maximum: 20 }, if: proc { self.type == 'G' }
         validates :oeclusiveAmount, allow_blank: true, length: { maximum: 20 }, if: proc { self.type == 'G' }
         validates :zexclusiveAmount, allow_blank: true, length: { maximum: 20 }, if: proc { self.type == 'G' }
-        validates :tax, allow_blank: true, length: { maximum: 20 }, if: proc { self.type == 'G' }
         validates :mainRemark, allow_blank: true, length: { maximum: 300 }, if: proc { self.type == 'G' }
         validates :invoiceType, allow_blank: true, length: { is: 2 }, inclusion: { in: %w(07 08) }, if: proc { self.type == 'G' }
 

data/lib/einvoice/tradevan/validator/issue_data_validator.rb

@@ -9,6 +9,14 @@ module Einvoice
         end
       end
 
+      class AllowanceIdentifierValidator < ActiveModel::EachValidator
+        def validate_each(record, attribute, value)
+          unless record.allowanceIdentifier =~ Regexp.new("\\A#{record.companyUn}_#{record.orgId}_")
+            record.errors.add attribute, options[:message] || :invalid
+          end
+        end
+      end
+
       class TotalValidator < ActiveModel::EachValidator
         def validate_each(record, attribute, value)
           unless value != record.itemList.map(&:itemTotal).map(&:to_i).inject(&:+)
@@ -46,30 +54,20 @@ module Einvoice
 
       class ItemListValidator < ActiveModel::EachValidator
         def validate_each(record, attribtue, value)
-          if %w(A G H).include?(record.type) && record.itemList.map(&:itemExclude).map(&:blank?).reduce(&:|)
+          if record.itemList.map(&:itemTotal).map(&:blank?).reduce(&:|)
             record.errors[:itemList] << options[:message] || :invalid
-          else
-            # none
-          end
-
-          if %w(I R).include?(record.type) && record.itemList.map(&:itemTotal).map(&:blank?).reduce(&:|)
-            record.errors[:itemList] << options[:message] || :invalid
-          else
-            # none
-          end
-
-          if record.type == 'I' && record.itemList.map(&:taxType).map(&:blank?).reduce(&:|)
+          elsif record.itemList.map(&:taxType).map(&:blank?).reduce(&:|)
             record.errors[:itemList] << options[:message] || :invalid
           else
             # none
           end
 
-          if record.type == 'H'
+          if %w(A H).include?(record.type)
             if record.itemList.map(&:invoiceNumber).map(&:blank?).reduce(&:|)
               record.errors[:itemList] << options[:message] || :invalid
             elsif record.itemList.map(&:invoiceDate).map(&:blank?).reduce(&:|)
               record.errors[:itemList] << options[:message] || :invalid
-            elsif record.itemList.map(&:invoiceTime).map(&:blank?).reduce(&:|)
+            elsif record.itemList.map(&:itemExclude).map(&:blank?).reduce(&:|)
               record.errors[:itemList] << options[:message] || :invalid
             else
               # none

data/lib/einvoice/version.rb

@@ -1,3 +1,3 @@
 module Einvoice
-  VERSION = "1.2.5"
+  VERSION = "1.2.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: einvoice
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - David Yun
@@ -151,7 +151,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl
+  name: factory_bot
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="