colissimo_label 0.14.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 564e96baddfb8b526dabff4637e429276260607de36d8cedb9eba0481d06a2b6
-  data.tar.gz: d26257b2781922ee6b754a83891bbc3cfc20b601de30ee84f0ef188508cb57b1
+  metadata.gz: d58ca859be28bd4c1904888ffd0a04ce9f2a0fe3eb4685d530a9c63ac64fc24d
+  data.tar.gz: b0101152eecda5a85baaf0f02e337abde20d525646e4c91751104dbc423cb554
 SHA512:
-  metadata.gz: 0dc4e1d6b1f179db83e007d469863d353c98958946b2fd6724fcda899fa482933d5e611936220efa2d459acb4fb95a5d4fc7ac1b46e23634250c593a5fe59d91
-  data.tar.gz: 26f97fa5cec2b359d45c06c0350445766f76142eaf36f3a9bfea2c28cdc8697aa1a44dc1b62ab339eb0f3708300148501a806aabe18e07de1a89f3f78e5f5807
+  metadata.gz: cf756d30f2c61764de70d2e60dbc0d5d0ecd1dbe75a6411a05457e8981042cddec79ebf37143fd5048a60a057e39649060a2e84614233c0f671be3fa97b012d9
+  data.tar.gz: 01c0681b6bc6c1a619299a6bd94f3151cd8a01ed3ccf4bfe22a8f4fcff77b7b4232cb9f833c5c46d72e2a5fd648869a25bf389f4ad02b5808b5bc3e1576cc423

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 0.19.0
+
+- Add new option field: specific TVA number for customs 
+
+## 0.18.0
+
+- Add new fields for UK after Brexit
+
+## 0.17.0
+
+- Add Sweden to mandatory signature countries
+
+## 0.16.0
+
+- Use correct default value for insurance
+
+## 0.15.0
+
+- Comment insurance value
+
 ## 0.14.0
 
 - Ensure local path is present

data/lib/colissimo_label/generate_label.rb

@@ -14,9 +14,11 @@ class ColissimoLabel::GenerateLabel
     @pickup_type          = options.fetch(:pickup_type, nil)
     @total_weight         = options.fetch(:total_weight, nil)
     @customs_total_weight = options.fetch(:customs_total_weight, nil)
+    @customs_tva_number   = options.fetch(:customs_tva_number, nil)
     @customs_data         = options.fetch(:customs_data, nil)
     @with_signature       = options.fetch(:with_signature, false)
-    @insurance_value      = options.fetch(:insurance_value, false)
+    @insurance_value      = options.fetch(:insurance_value, nil)
+    @eori_number          = options.fetch(:eori_number, nil)
     @label_output_format  = options.fetch(:label_output_format, 'PDF_10x15_300dpi')
     @errors               = []
   end
@@ -50,7 +52,7 @@ class ColissimoLabel::GenerateLabel
       end
     end
 
-    if status == 400
+    if status == 400 || status == 500
       error_message = response.body.to_s.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '').scan(/"messageContent":"(.*?)"/).last&.first
       raise StandardError, error_message
     elsif status == 503
@@ -98,8 +100,9 @@ class ColissimoLabel::GenerateLabel
                                           "addressee": {
                                             "address": format_addressee
                                           }
-                                        }.merge(customs)
-                    }.compact)
+                                        }.merge(customs_letter)
+                    }.merge(customs_fields)
+                     .compact)
   end
 
   # Services =>
@@ -168,11 +171,12 @@ class ColissimoLabel::GenerateLabel
   end
 
   # Déclaration douanière de type CN23
-  def customs
+  def customs_letter
     if require_customs?
       {
         "customsDeclarations": {
-          "includeCustomsDeclarations": 1, # Inclure déclaration
+          "includeCustomsDeclarations": 1, # Inclure déclaration,
+          "importersReference": @customs_tva_number, # Numéro TVA pour la douane, si besoin
           "contents": {
             "article":  @customs_data.map { |customs|
               {
@@ -203,8 +207,25 @@ class ColissimoLabel::GenerateLabel
     end
   end
 
+  def customs_fields
+    if require_customs?
+      {
+        "fields": {
+          "customField": [
+                           {
+                             "key":   'EORI',
+                             "value": @eori_number
+                           }
+                         ]
+        }
+      }
+    else
+      {}
+    end
+  end
+
   def require_customs?
-    %w[CH NO US].include?(@destination_country)
+    %w[CH NO US GB].include?(@destination_country)
   end
 
   # Certains pays, comme l'Allemagne, requiert une signature pour la livraison
@@ -214,7 +235,7 @@ class ColissimoLabel::GenerateLabel
   # BPR : Colissimo - Point Retrait – en Bureau de Poste
   # A2P : Colissimo - Point Retrait – en relais Pickup ou en consigne Pickup Station
   def product_code
-    if %w[DE IT ES GB LU NL DK AT].include?(@destination_country)
+    if %w[DE IT ES GB LU NL DK AT SE].include?(@destination_country)
       'DOS'
     elsif !@pickup_id.nil? && %w[FR].include?(@destination_country)
       @pickup_type || 'BPR'

data/lib/colissimo_label/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ColissimoLabel
-  VERSION = '0.14.0'.freeze
+  VERSION = '0.19.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colissimo_label
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.19.0
 platform: ruby
 authors:
 - FloXcoder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.3
+rubygems_version: 3.2.3
 signing_key: 
 specification_version: 4
 summary: Generate Colissimo label for all countries