colissimo_label 0.13.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3839699e6df747be915fcfdbcdf6e4c1379d5a4416d8abb2192c6f375e304b20
-  data.tar.gz: af49d9fa2eabdee0eab4e7f66a26143936c6bad91ce3941c75909b92b97fbb9e
+  metadata.gz: e85c64c5c035a54da59c9695851ad8be29dc0083353f10065dc2b35e9088ee5e
+  data.tar.gz: 863ca8375cdf9bacafde3fea451fd695051d3bee5b5b52d1f2f44c606637a441
 SHA512:
-  metadata.gz: a75c052a57417f1026dc313bf2a1145864fdf0a33c0d5d01a226c6ce7128ee06d9658ee19fcc81739c4c6a09ea14aa0fe7cfdcada17db27e7fca2a36025a0887
-  data.tar.gz: ff5615cbdc6966a449edbfca3de8fc1410ca02ff931c0b0ed1f901b244260c5318e216425c7f39e1f51d3d6020f215e7dce122268026edeea28b8d25c435e8d1
+  metadata.gz: 395bd4aa3613b9e253dd641e38d74ed3205768e47ada8d6d07a06372225aa2afd5476b99c4736393b163192e405d832ef08059b3eabeef589a3877887d94e7a0
+  data.tar.gz: 4982d55a321d6579a3655c0a3306bd09396a34db819a410fc308931439701a55178da0bdee852674ec2becfa749a71a4c9eb363c1c7a10bcacdcd628f03088b9

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 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
+
 ## 0.13.0
 
 - Multiple improvements

data/lib/colissimo_label/generate_label.rb

@@ -16,7 +16,8 @@ class ColissimoLabel::GenerateLabel
     @customs_total_weight = options.fetch(:customs_total_weight, 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
@@ -26,7 +27,7 @@ class ColissimoLabel::GenerateLabel
     status         = response.code
     parts          = response.to_a.last.force_encoding('BINARY').split('Content-ID: ')
     label_filename = @filename + '.' + file_format
-    local_path     = ColissimoLabel.colissimo_local_path.chomp('/')
+    local_path     = ColissimoLabel.colissimo_local_path&.chomp('/')
 
     if ColissimoLabel.s3_bucket
       colissimo_pdf = ColissimoLabel.s3_bucket.object(ColissimoLabel.s3_path.chomp('/') + '/' + label_filename)
@@ -50,7 +51,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 +99,9 @@ class ColissimoLabel::GenerateLabel
                                           "addressee": {
                                             "address": format_addressee
                                           }
-                                        }.merge(customs)
-                    }.compact)
+                                        }.merge(customs_letter)
+                    }.merge(customs_fields)
+                     .compact)
   end
 
   # Services =>
@@ -168,7 +170,7 @@ class ColissimoLabel::GenerateLabel
   end
 
   # Déclaration douanière de type CN23
-  def customs
+  def customs_letter
     if require_customs?
       {
         "customsDeclarations": {
@@ -203,8 +205,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 +233,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.13.0'.freeze
+  VERSION = '0.18.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colissimo_label
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.18.0
 platform: ruby
 authors:
 - FloXcoder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-07 00:00:00.000000000 Z
+date: 2021-01-05 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.4
 signing_key: 
 specification_version: 4
 summary: Generate Colissimo label for all countries