solidus_bactracs 3.5.1 → 4.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e535e8a59bea282ee76d1fe01b99f738d19061abf29d1745e40bdcce792337e
-  data.tar.gz: 75d5f6d07e1fd88e1f30c46418c674059b582aca33a884b16830be441d39a708
+  metadata.gz: 6f99389fef1884774ea48288c06c73ee6cd32a14f47b3486ac190a3c6288c9c3
+  data.tar.gz: 15db2dede75d78d1ff8024dd2d08f04c85eacdfdc63a9135e7d3b8ffc1acc076
 SHA512:
-  metadata.gz: 39918c8782cd792f3fa091b2762dda89ea07db28a33a0598711fa561010a9eef293e2d7eb94c5f921f23a49a9afef5d995ee242f3a8fb4ce949f41a53d36f038
-  data.tar.gz: b47a72baad881dfe7645addb7caadf4be5529d90d625b73bd32341d992d04ad110d56f7dc8730744a46ba55cb6edb45b1e3a19bbe6efe78a6363fbb2a17822c4
+  metadata.gz: a40e94cb272473e5634b09605f78aff10e0b7270a41e61202c00484351e76cdf5fe0e998de077864b89c73f38b2d6bd0317e734bd553addfa19a2aa306d6f8b3
+  data.tar.gz: b52d112aaffa6a71dd116f7eb78ec2e4bdd2e17f1b538a29a5ab16e739df48e261c5f83c7a419f8ab5a745b2ad1820d047f75ae7a758a9e3354d3378c1f94132

data/.tool-versions

@@ -1 +1 @@
-ruby 3.1.1
+ruby 3.1.2

data/README.md

@@ -4,6 +4,8 @@
 This gem integrates [Bactracs](http://www.bactracs.com) with [Solidus](http://solidus.io). It
 enables your Solidus system to push shipment RMAs to the system.
 
+> Currently this requires Solidus ~ 4.x
+
 > This integration was cloned from [spree_shipstation](https://github.com/DynamoMTL/spree_shipstation) to provide some consistency with other Solidus<-->Shipping related patterns.
 
 ## Installation

data/app/jobs/solidus_bactracs/api/sync_shipments_job.rb

@@ -27,10 +27,7 @@ module SolidusBactracs
           if ThresholdVerifier.call(shipment)
             true
           else
-            ::Spree::Event.fire(
-              'solidus_bactracs.api.sync_skipped',
-              shipment: shipment,
-            )
+            ::Spree::Bus.publish(:'solidus_bactracs.api.sync_skipped', shipment:)
 
             false
           end

data/lib/solidus_bactracs/api/batch_syncer.rb

@@ -23,19 +23,10 @@ module SolidusBactracs
         begin
           response = client.bulk_create_orders(shipments)
         rescue RateLimitedError => e
-          ::Spree::Event.fire(
-            'solidus_bactracs.api.rate_limited',
-            shipments: shipments,
-            error: e,
-          )
-
+          ::Spree::Bus.publish(:'solidus_bactracs.api.rate_limited', shipments: shipments, error: e)
           raise e
         rescue RequestError => e
-          ::Spree::Event.fire(
-            'solidus_bactracs.api.sync_errored',
-            shipments: shipments,
-            error: e,
-          )
+          ::Spree::Bus.publish(:'solidus_bactracs.api.sync_errored', shipments: shipments, error: e)
 
           raise e
         end

data/lib/solidus_bactracs/api/request_runner.rb

@@ -29,7 +29,7 @@ module SolidusBactracs
               Rails.logger.info({ event: 'success CreateRMA', rma: shipment.number, response: parse_rma_creation_response(rma_response, "Message")})
               shipment_synced(shipment)
               return true
-            elsif rma_exists?(rma_response)
+            elsif rma_exists?(rma_response) or rma_fail?(rma_response)
               return false
             else
               clear_cache
@@ -89,7 +89,7 @@ module SolidusBactracs
 
         raise RequestError.from_response(@response) unless @response # just try again for @retries?
         if "false" == parse_authentication_response(@response, "Result")
-          Rails.logger.warn({ event: 'bactracs auth failed', error: parse_authentication_response(@response, "Message")})
+          Rails.logger.error({ event: 'bactracs auth failed', error: parse_authentication_response(@response, "Message")})
           raise RequestError.from_response(@response)
         end
         sguid = parse_authentication_response(@response, "Message")
@@ -110,26 +110,28 @@ module SolidusBactracs
       end
 
       def rma_exists?(response)
+        if parse_rma_creation_response(response, "Message").match(/failed CreateRMA/)
+          Rails.logger.error({ event: 'bactracs failed CreateRMA', error: parse_rma_creation_response(response, "Message")})
+          return true
+        end
+      end
+
+      def rma_fail?(response)
         if parse_rma_creation_response(response, "Message").match(/rma .* already exists/)
-          Rails.logger.warn({ event: 'bactracs failed CreateRMA', error: parse_rma_creation_response(response, "Message")})
+          Rails.logger.error({ event: 'bactracs failed CreateRMA', error: parse_rma_creation_response(response, "Message")})
           return true
         end
       end
 
+
       def shipment_synced(shipment)
         shipment.update_attribute(:bactracs_synced_at, Time.zone.now)
 
-        ::Spree::Event.fire(
-          'solidus_bactracs.api.sync_completed',
-          shipment: shipment
-        )
+        ::Spree::Bus.publish(:'solidus_bactracs.api.sync_completed', shipment:)
       end
 
       def shipment_sync_failed(shipment)
-        ::Spree::Event.fire(
-          'solidus_bactracs.api.sync_failed',
-          shipment: shipment
-        )
+        ::Spree::Bus.publish(:'solidus_bactracs.api.sync_failed', shipment:)
       end
     end
   end

data/lib/solidus_bactracs/api/shipment_serializer.rb

@@ -69,8 +69,9 @@ module SolidusBactracs
             end
           end
         end
-        Rails.logger.info(xml.to_s)
-        xml
+        # Rails.logger.info(xml.to_s)
+        @xml = xml.to_xml.sub(/<to_xml\/>$/,'')
+        return @xml
       end
 
       def line_items_xml(xml: nil, line_item: nil, variant: nil, order: nil)

data/lib/solidus_bactracs/console_harness.rb

@@ -36,7 +36,7 @@ module SolidusBactracs
       # resp = @runner.call(:post, '/orders/createorders', [serialize(shipment)])
       resp = @runner.authenticated_call(shipment: shipment, serializer: @syncer.client.shipment_serializer)
       if resp
-        @cursor += 1
+        @cursor += 1 if (a_shipment == @shipments[@cursor] || shipment == @shipments[@cursor])
         return resp
       end
     ensure

data/lib/solidus_bactracs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusBactracs
-  VERSION = '3.5.1'
+  VERSION = '4.0.0'
 end

data/solidus_bactracs.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency 'httparty', '~> 0.18'
-  spec.add_dependency 'solidus_core', ['>= 2.0.0', '< 4']
+  spec.add_dependency 'solidus_core', ['>= 4.0'] # , '< 4']
   spec.add_dependency 'solidus_support', '~> 0.5'
 
   spec.add_development_dependency 'rails-controller-testing'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bactracs
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Zeryab Ali
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-14 00:00:00.000000000 Z
+date: 2024-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -31,20 +31,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: solidus_support
   requirement: !ruby/object:Gem::Requirement