colissimo_label 0.11.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b0795676ddd57f1b5503c5180b91adb60234af5d3411a0a7f18fdd0e493d2ec
-  data.tar.gz: 3d2035bafc6cb5ace72033aa749bff5d035c54c9a22fcee32ac87d75e07961d6
+  metadata.gz: c66bd1f3e7fd14f452e096ec6dfdfe3f8818939a43b577c899a011c12bdf6b8b
+  data.tar.gz: 37708156fdaecc9ffe79f3aa991a75ab3d688cfb8c692048e9944966d94b9112
 SHA512:
-  metadata.gz: 4d6f83c49db31c0fc2ebbf74d13669bd234a1847343f161b16c63aa08fa7fce7f0c4f4d9567ee7b33a733865e13525dc59cc26520a411575ea0fdb37a9598a76
-  data.tar.gz: 287a401e7c7d8b85b4b801b9daf64604fab30d101b4b4cfe6705642ebde0a402030a79283d6158ca8f718de7df511e5c8b4659360845df79be96d908774b1032
+  metadata.gz: c4239b31017b0deba9d4ad955f3fb7b42c2a01dbaaf592335f525e457059cd85b8ff4e1729712a2680e0bcabf260409a00291c9b581ac18b9ab67d792598f21b
+  data.tar.gz: '08f1e4e868e6f238b25b3cf60da9b7aa027eb2a38b61d7b51a7750cbff7721a27441e5657442bec3cbec25528b3a83eafb035689dbe980ba3795de11b40bcd90'

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## 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
+
+## 0.12.0
+
+- Add Austria to mandatory signature countries
+
 ## 0.11.0
 
 - Add option to generate label with signature

data/lib/colissimo_label/generate_label.rb

@@ -12,9 +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, nil)
+    @label_output_format  = options.fetch(:label_output_format, 'PDF_10x15_300dpi')
     @errors               = []
   end
 
@@ -22,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
@@ -40,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
@@ -71,7 +77,7 @@ class ColissimoLabel::GenerateLabel
                       "outputFormat":   {
                         "x":                  '0',
                         "y":                  '0',
-                        "outputPrintingType": 'PDF_10x15_300dpi'
+                        "outputPrintingType": @label_output_format
                       },
                       "letter":         {
                                           "service":   {
@@ -83,7 +89,8 @@ class ColissimoLabel::GenerateLabel
                                           },
                                           "parcel":    {
                                                          "weight":           format_weight,
-                                                         "pickupLocationId": @pickup_id
+                                                         "pickupLocationId": @pickup_id,
+                                                         "insuranceValue":   @insurance_value
                                                        }.compact,
                                           "sender":    {
                                             "address": format_sender
@@ -105,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
@@ -141,7 +163,7 @@ class ColissimoLabel::GenerateLabel
     if require_customs?
       @customs_total_weight
     else
-      '0.1'
+      @total_weight ? @total_weight : '0.1'
     end
   end
 
@@ -155,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)
@@ -182,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
@@ -192,7 +214,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].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'

data/lib/colissimo_label/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colissimo_label
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.16.0
 platform: ruby
 authors:
 - FloXcoder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-04-22 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.1.2
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Generate Colissimo label for all countries