colissimo_label 0.10.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a22b61de439cdc82fd0aa84681df72ddb77a9684c2a779ccfff59f26dadad4b
-  data.tar.gz: f48aa5520d7506e839c1482a9df01c35c37ef5bf5ef2b6e091c1fcdab2e5f219
+  metadata.gz: 8a6695bec2480207d3e9479703468a8252941b2598944ac67b105330f9c7366a
+  data.tar.gz: e28880586b4cef27762d685a8774d800cc8e1b85f07ca4ec2f07532b7a5c3dd6
 SHA512:
-  metadata.gz: 060fa43d23c1a77f125b2ec4075032845eb00217c61ba129dc6acff606cd3ebe5728faf6e040f9b7fb99dd87c65bb74aa1642c180cdcf4febca1270f65c15b85
-  data.tar.gz: f2d2f7aee74e4b54d34d84e471be2cc7a8f7eef09cc01a094defc50f25d412f7a28597edf08ad07100793ed2cff33b0a82d0048cd1c33398db3c5a36b6a6bd2b
+  metadata.gz: a2dde7499384b99d861bdf13dd98909fdbb3385e0412bbfab0241096eabd070cbc9eb33d786c4c6e5793ab36bfe3b9433ae4eb74612421871823cee9448aa12d
+  data.tar.gz: 03dadf09a8be60b8c7da502d1da1363d5bc1aae17ecad0aede37e2d0bc573d7fc069296770f3b01b2e6655d2284588cb38837ffa91badd95c2e0a3975cac86bc

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 0.15.0
+
+- Comment insurance value
+
+## 0.14.0
+
+- Ensure local path is present
+
+## 0.13.0
+
+- Multiple improvements
+
+## 0.12.0
+
+- Add Austria to mandatory signature countries
+
+## 0.11.0
+
+- Add option to generate label with signature
+
 ## 0.10.0
 
 - Add Denmark to mandatory signature countries

data/README.md

@@ -138,6 +138,12 @@ parcel_number = ColissimoLabel::GenerateLabel.new(
       ).perform
 ```
 
+You can add the following option to require the signature:
+
+```
+with_signature: true
+```
+
 For a national address and delivered to a relay point:
 
 ```ruby

data/lib/colissimo_label/generate_label.rb

@@ -12,8 +12,12 @@ class ColissimoLabel::GenerateLabel
     @addressee_data       = addressee_data
     @pickup_id            = options.fetch(:pickup_id, nil)
     @pickup_type          = options.fetch(:pickup_type, nil)
+    @total_weight         = options.fetch(:total_weight, nil)
     @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)
+    @label_output_format  = options.fetch(:label_output_format, 'PDF_10x15_300dpi')
     @errors               = []
   end
 
@@ -21,13 +25,14 @@ class ColissimoLabel::GenerateLabel
     response       = perform_request
     status         = response.code
     parts          = response.to_a.last.force_encoding('BINARY').split('Content-ID: ')
-    label_filename = @filename + '.pdf'
+    label_filename = @filename + '.' + file_format
+    local_path     = ColissimoLabel.colissimo_local_path&.chomp('/')
 
     if ColissimoLabel.s3_bucket
       colissimo_pdf = ColissimoLabel.s3_bucket.object(ColissimoLabel.s3_path.chomp('/') + '/' + label_filename)
       colissimo_pdf.put(acl: 'public-read', body: parts[2])
     else
-      File.open(ColissimoLabel.colissimo_local_path.chomp('/') + '/' + label_filename, 'wb') do |file|
+      File.open(local_path + '/' + label_filename, 'wb') do |file|
         file.write(parts[2])
       end
     end
@@ -39,15 +44,17 @@ class ColissimoLabel::GenerateLabel
         customs_pdf = ColissimoLabel.s3_bucket.object(ColissimoLabel.s3_path.chomp('/') + '/' + customs_filename)
         customs_pdf.put(acl: 'public-read', body: parts[3])
       else
-        File.open(ColissimoLabel.colissimo_local_path.chomp('/') + '/' + customs_filename, 'wb') do |file|
+        File.open(local_path + '/' + customs_filename, 'wb') do |file|
           file.write(parts[3])
         end
       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
+      raise StandardError, { message: 'Colissimo: Service Unavailable' }
     else
       if (response_message = response.body.to_s.encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '').scan(/"parcelNumber":"(.*?)",/).last)
         parcel_number = response_message.first
@@ -70,7 +77,7 @@ class ColissimoLabel::GenerateLabel
                       "outputFormat":   {
                         "x":                  '0',
                         "y":                  '0',
-                        "outputPrintingType": 'PDF_10x15_300dpi'
+                        "outputPrintingType": @label_output_format
                       },
                       "letter":         {
                                           "service":   {
@@ -82,7 +89,8 @@ class ColissimoLabel::GenerateLabel
                                           },
                                           "parcel":    {
                                                          "weight":           format_weight,
-                                                         "pickupLocationId": @pickup_id
+                                                         "pickupLocationId": @pickup_id,
+                                                         # "insuranceValue":   @insurance_value
                                                        }.compact,
                                           "sender":    {
                                             "address": format_sender
@@ -104,14 +112,29 @@ class ColissimoLabel::GenerateLabel
     "https://ws.colissimo.fr/sls-ws/SlsServiceWSRest/2.0/#{service}"
   end
 
+  def file_format
+    case @label_output_format
+    when 'PDF_A4_300dpi', 'PDF_10x15_300dpi'
+      'pdf'
+    when 'ZPL_10x15_300dpi', 'ZPL_10x15_203dpi'
+      'zpl'
+    when 'DPL_10x15_300dpi', 'DPL_10x15_203dpi'
+      'dpl'
+    else
+      'pdf'
+    end
+  end
+
   def format_sender
     {
       "companyName": @sender_data[:company_name],
+      "lastName":    @sender_data[:last_name],
+      "firstName":   @sender_data[:first_name],
       "line2":       @sender_data[:address],
       "city":        @sender_data[:city],
       "zipCode":     @sender_data[:postcode],
       "countryCode": @sender_data[:country_code]
-    }
+    }.compact.transform_values(&:strip)
   end
 
   def format_addressee
@@ -140,7 +163,7 @@ class ColissimoLabel::GenerateLabel
     if require_customs?
       @customs_total_weight
     else
-      '0.1'
+      @total_weight ? @total_weight : '0.1'
     end
   end
 
@@ -154,9 +177,9 @@ class ColissimoLabel::GenerateLabel
             "article":  @customs_data.map { |customs|
               {
                 "description":   customs[:description],
-                "quantity":      customs[:quantity],
-                "weight":        customs[:weight],
-                "value":         customs[:item_price],
+                "quantity":      customs[:quantity]&.to_i,
+                "weight":        customs[:weight]&.to_f.round(2),
+                "value":         customs[:item_price]&.to_f.round(2),
                 "originCountry": customs[:country_code],
                 "currency":      customs[:currency_code],
                 "hsCode":        customs[:customs_code] # Objets d'art, de collection ou d'antiquité (https://pro.douane.gouv.fr/prodouane.asp)
@@ -181,7 +204,7 @@ class ColissimoLabel::GenerateLabel
   end
 
   def require_customs?
-    %w[CH].include?(@destination_country)
+    %w[CH NO US].include?(@destination_country)
   end
 
   # Certains pays, comme l'Allemagne, requiert une signature pour la livraison
@@ -191,10 +214,12 @@ 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].include?(@destination_country)
+    if %w[DE IT ES GB LU NL DK AT].include?(@destination_country)
       'DOS'
     elsif !@pickup_id.nil? && %w[FR].include?(@destination_country)
       @pickup_type || 'BPR'
+    elsif @with_signature
+      'DOS'
     else
       'DOM'
     end

data/lib/colissimo_label/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colissimo_label
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.15.0
 platform: ruby
 authors:
 - FloXcoder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-28 00:00:00.000000000 Z
+date: 2020-08-07 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.0.4
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Generate Colissimo label for all countries