colissimo_label 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca83c743c1c77cb16b1f6b69affd27a9cef0f8764ac8e040e0dc1140c7b6ca00
-  data.tar.gz: '085eb898be66d652bc0ec3d3956d8c85d45a7a057d51bdaba9f1a0735d4b2b90'
+  metadata.gz: 3839699e6df747be915fcfdbcdf6e4c1379d5a4416d8abb2192c6f375e304b20
+  data.tar.gz: af49d9fa2eabdee0eab4e7f66a26143936c6bad91ce3941c75909b92b97fbb9e
 SHA512:
-  metadata.gz: b062b3410066ffe720a0964ef55e38549cdfa46bcf28baa3ee453cdb21e69c89946ea379c81115e39da9d78c4888164749d93d999495ff5a3afa385920c6af96
-  data.tar.gz: 53da88d14f748ef7af9c6c32aa2146df98f0afb29809df1a66e5b3dcc052cdedaab1aef2ff27ba5e695da47fade9071715273a0fb7efa2e1ff4738c52f77eb32
+  metadata.gz: a75c052a57417f1026dc313bf2a1145864fdf0a33c0d5d01a226c6ce7128ee06d9658ee19fcc81739c4c6a09ea14aa0fe7cfdcada17db27e7fca2a36025a0887
+  data.tar.gz: ff5615cbdc6966a449edbfca3de8fc1410ca02ff931c0b0ed1f901b244260c5318e216425c7f39e1f51d3d6020f215e7dce122268026edeea28b8d25c435e8d1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.13.0
+
+- Multiple improvements
+
 ## 0.12.0
 
 - Add Austria to mandatory signature countries

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, false)
+    @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,7 +44,7 @@ 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
@@ -49,6 +53,8 @@ class ColissimoLabel::GenerateLabel
     if status == 400
       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

data/lib/colissimo_label/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: colissimo_label
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - FloXcoder
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-18 00:00:00.000000000 Z
+date: 2020-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack