solidus_bactracs 3.3.1 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f2ad0b256952771d0f451dc24a4f3e18a42a0ebfc48947254a0473676fc9630
-  data.tar.gz: c74eeec842d70239114ff695479c0dabeeefc4af3eb869f7493eca2df1bc78bd
+  metadata.gz: 9bbd41ca4504892004e3c4b39dd1688529cc02ca50dafbeb62b33f7f1bff14e4
+  data.tar.gz: 11c2cf0ee91d07eec4e08fa3ed2c5c0f4756cb2ef3e2cccacb605ee1d1f8dc74
 SHA512:
-  metadata.gz: 5f0ed8d6d3fbca729db366a103ec0fc7ced78c9a9c41230d7467d0a2141292fbf398e08a8d64af8a915dbcab9569f1781a61215d196ea34d546f2fc21a25c4ae
-  data.tar.gz: 8a2e482a15f81d577922a87462c21f83ba885d09a0b6fdc55e567236b5245ecbed8b51cd9a53ecb144664ca3e882f8677b754bb2abd23258f38283580e4953c5
+  metadata.gz: cb76a600bbefb62da8c9e066b9dec324c85506ebb7d616c2e3b6a857eff8f89133a08b0369f700e4441250e8342c093adbc4547951baf3a0da5b5b4f83347fca
+  data.tar.gz: 57eee50b741eb981483c6952aface01438f00bbd8fc7e7fae64819669997059009a72d3aafdcb4fb14c06466e18efc5dae6172497953eaffa6668cd39fc18c10

data/.ruby-version

@@ -1 +1 @@
-ruby 2.7.2
+3.1.2

data/.tool-versions

@@ -1 +1 @@
-ruby 2.7.2
+ruby 3.1.1

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

@@ -21,10 +21,10 @@ module SolidusBactracs
       end
 
       def query_shipments
-        shipments = SolidusBactracs::Shipment::PendingApiSyncQuery.apply(all_elegible_shipments)
+        shipments = SolidusBactracs::Shipment::PendingApiSyncQuery.apply(all_eligible_shipments)
       end
 
-      def all_elegible_shipments(skus: SolidusBactracs.config.shippable_skus, state: :ready)
+      def all_eligible_shipments(skus: SolidusBactracs.config.shippable_skus, state: :ready)
         ::Spree::Shipment
             .joins(inventory_units: [:variant])
             .where("spree_variants.sku" => skus)

data/lib/solidus_bactracs/api/shipment_serializer.rb

@@ -13,6 +13,8 @@ module SolidusBactracs
       def call(sguid: nil)
         order = @shipment.order
         user = @shipment.user
+        rma_type = safe_rma_type
+        rp_location = get_rp_location
 
         xml = Builder::XmlMarkup.new
         xml.instruct!(:xml, :encoding => "UTF-8")
@@ -23,7 +25,7 @@ module SolidusBactracs
               xml.sGuid                       sguid
               xml.NewRMA {
                 xml.RMANumber                 @shipment.number
-                xml.RMATypeName               @shipment.rma_type.present? ? @shipment.rma_type : @config.evaluate_rma_type
+                xml.RMATypeName               rma_type
                 xml.RMASubTypeName
                 xml.CustomerRef
                 xml.InboundShippingPriority
@@ -92,10 +94,20 @@ module SolidusBactracs
           xml.WarrantyRepair
           xml.RMALineTest
           xml.InboundShipWeight       variant.weight.to_f
-          xml.RPLocation              @config.default_rp_location
+          xml.RPLocation              rp_location
         }
       end
 
+      def safe_rma_type
+        rma_type = @shipment.rma_type if (@shipment.respond_to?(:rma_type) && @shipment.rma_type.present?)
+        rma_type ||= @config.evaluate_rma_type.call(@shipment)
+      end
+
+      def get_rp_location
+        rp_location = @shipment.get_rma_rp_location if @shipment.get_rma_rp_location
+        @config.default_rp_location.call(@shipment)
+      end
+
       def find_sku_variant(variant)
         @config.sku_map[variant.sku].present? ? @config.sku_map[variant.sku] : variant.sku
       end

data/lib/solidus_bactracs/console_harness.rb

@@ -9,7 +9,7 @@ module SolidusBactracs
       @syncer = SolidusBactracs::Api::BatchSyncer.from_config
       @sync = SolidusBactracs::Api::ScheduleShipmentSyncsJob.new
       @shipments = SolidusBactracs::Api::ScheduleShipmentSyncsJob.new.query_shipments
-      @shipments_elegible = SolidusBactracs::Api::ScheduleShipmentSyncsJob.new.all_elegible_shipments
+      @shipments_elegible = SolidusBactracs::Api::ScheduleShipmentSyncsJob.new.all_eligible_shipments
       @cursor = 0
       @batch = 4
     end
@@ -18,11 +18,11 @@ module SolidusBactracs
       @shipments = SolidusBactracs::Api::ScheduleShipmentSyncsJob.new.query_shipments
     end
 
-    def shipment(id)
+    def has_shipment?(id)
       @shipments.find_by(id: id)
     end
 
-    def shipment_number(ship_number)
+    def has_shipment_number?(ship_number)
       @shipments.find_by(number: ship_number)
     end
 

data/lib/solidus_bactracs/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bactracs
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.4.0
 platform: ruby
 authors:
 - Zeryab Ali
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-16 00:00:00.000000000 Z
+date: 2022-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: A Solidus extension for integrating the Bactracs API.