solidus_bactracs 3.3.1 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f2ad0b256952771d0f451dc24a4f3e18a42a0ebfc48947254a0473676fc9630
-  data.tar.gz: c74eeec842d70239114ff695479c0dabeeefc4af3eb869f7493eca2df1bc78bd
+  metadata.gz: c253cf9eff07138bbc398a46d8cb03d0d30af1c0d7000e91554135cc15a8fbd9
+  data.tar.gz: 3683cd659eef9d33c6f487b8611876cb756697778ef7fd1856c752a355cbf2a9
 SHA512:
-  metadata.gz: 5f0ed8d6d3fbca729db366a103ec0fc7ced78c9a9c41230d7467d0a2141292fbf398e08a8d64af8a915dbcab9569f1781a61215d196ea34d546f2fc21a25c4ae
-  data.tar.gz: 8a2e482a15f81d577922a87462c21f83ba885d09a0b6fdc55e567236b5245ecbed8b51cd9a53ecb144664ca3e882f8677b754bb2abd23258f38283580e4953c5
+  metadata.gz: e5fffca275370de98ca4f38fa53b144275c0d37a5c09f1de2445ac8ce0586d2a8ebd4f8d6eb714fdca045c9dab16a2a68b09420c4905d49b2995408743a959bb
+  data.tar.gz: 45d5a089947e1c9ebb741066bc3d13ba165bbc42b027bfb58d9c2d6d1cb3aa496d96d81e0196d479328fd6d78883b8f966cb08210c02429f711d398825757573

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,7 @@ module SolidusBactracs
       def call(sguid: nil)
         order = @shipment.order
         user = @shipment.user
+        rma_type = safe_rma_type
 
         xml = Builder::XmlMarkup.new
         xml.instruct!(:xml, :encoding => "UTF-8")
@@ -23,7 +24,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
@@ -96,6 +97,11 @@ module SolidusBactracs
         }
       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 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.3.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bactracs
 version: !ruby/object:Gem::Version
-  version: 3.3.1
+  version: 3.3.2
 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-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty