erp_integration 0.24.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97c1c75b5b15e68c4fd472e18a6c3fc2a4f23e249e968d1e71aeee95f754a331
-  data.tar.gz: 952602889086f2d727acd5a2fce5e956e9c510a86fac9b0f6f090ec6608a7bc2
+  metadata.gz: '0820135e4a0b603c15f4e46615a3682c229f415ac5f9023b6a8c8fdd118f2471'
+  data.tar.gz: e7a1cdb300cebb0c9005823160ccfc54162eb27b4037b427a391f79ce21cc822
 SHA512:
-  metadata.gz: fe64267ae5b1f52918f4e212120914dfe5a10f02ee90d7232555301b876262c5a435b51b1bcd0b621315eb1812d496f47a7d64fbcadf761d1b6014e65a0db620
-  data.tar.gz: aef83df0dacf867cf54447fa22c3187f2584e99769881bec06630664a4a5587401cf7a7b34dece12001219c7bc9e6fffa1a1ed6e4da4986cf62bfd1927d78b55
+  metadata.gz: f225c537e56518eab0d9356b965802a074ab67995ff0ee3aaabc23eafd383094c6eb0650add2589496fb9dbcbe9810cefec1677b278d46363082850f931cf0ec
+  data.tar.gz: 0d63e7169eb701247f5f89e0759de9f3a8f2a936a093e93b9cda449b9ba163e307010e0c25c059b9932935ca344e8d33613c2a669538a5ed49256bcb4747ae2e

data/.github/workflows/pull_requests.yml

@@ -15,4 +15,4 @@ jobs:
     steps:
       - uses: seferov/pr-lint-action@master
         with:
-          title-regex: '^\[RELEASE|NO-TICKET|DL|UDL|AD|DU|AR|IN|CON|DIS|AS|MT|SCR|DEL-\d*\](\ )'
+          title-regex: '^\[RELEASE|NO-TICKET|DL|UDL|AD|DU|AR|IN|CON|DIS|AS|MT|SCR|RO|DEL-\d*\](\ )'

data/lib/erp_integration/fulfil/client.rb

@@ -39,7 +39,7 @@ module ErpIntegration
           # Notice that logging headers will expose sensitive information
           # like api-key. To avoid use filters:
           # https://lostisland.github.io/faraday/middleware/logger
-          faraday.response :logger, @logger, { headers: false, bodies: true }
+          faraday.response :logger, @logger, { headers: false, bodies: true } if @logger
 
           # Custom error handling for the error response
           faraday.use ErpIntegration::Middleware::ErrorHandling

data/lib/erp_integration/fulfil/resources/customer_shipment_return.rb

@@ -10,6 +10,12 @@ module ErpIntegration
 
         def generate_shipping_label(id)
           client.put("model/#{model_name}/#{id}/generate_shipping_labels")
+          true
+        # Workaround: Fulfil api does not return a json when status code is 200 (a.k.a. "Ok")
+        # and faraday is having an error when trying to parse it. Let's skip the parse error
+        # and move on.
+        rescue Faraday::ParsingError
+          true
         end
 
         def create_default_package(id)

data/lib/erp_integration/sales_order.rb

@@ -11,10 +11,9 @@ module ErpIntegration
                   :invoice_address, :invoice_method, :invoice_state, :invoices,
                   :lines, :metadata, :payment_term, :payment_total, :price_list,
                   :reference, :sales_person, :shipment_amount, :shipment_method,
-                  :shipment_state, :shipments, :shipping_start_date, :state,
-                  :tax_amount, :total_amount, :total_quantity, :total_shipment_cost,
-                  :untaxed_amount, :warehouse, :weight, :weight_uom, :write_date,
-                  :write_uid
+                  :shipment_returns, :shipment_state, :shipments, :shipping_start_date,
+                  :state, :tax_amount, :total_amount, :total_quantity, :total_shipment_cost,
+                  :untaxed_amount, :warehouse, :weight, :weight_uom, :write_date, :write_uid
 
     def cancel
       self.class.adapter.cancel(id)

data/lib/erp_integration/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ErpIntegration
-  VERSION = '0.24.0'
+  VERSION = '0.26.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: erp_integration
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.26.0
 platform: ruby
 authors:
 - Stefan Vermaas
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-14 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport