solidus_bactracs 3.5.0 → 3.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68d5604c3c0c9d1adc9f28adcbad8ada220a5298b6da3bd95e3191d9312c3f83
-  data.tar.gz: 68afe48eca765056b7ee4911a7adc678c0d9b3a9ec80a5f837a28abe162fdb8c
+  metadata.gz: 3d733c0f761c26283033cc63a123d7104fda4400a5ad918929d525be036a4206
+  data.tar.gz: 30b2aee8a90add793153cf78faa81586915f8b6eb8f452621d6652f5adb758e3
 SHA512:
-  metadata.gz: e4c01a7f12a92561bad95e64c0b47d84dbc56c20680f9ce6a52eb41daff320a0ed73e7dee511fb5b6a3936f2a579199b51cfe167b287fe917dc6f36c60570471
-  data.tar.gz: a24a630d3b523e8a4ee8d8423f3b066bd2d8de9afb7bdcacdd542da437fc8c357d0a4ce082c590737b3b9bf8735c647ecfc0c89b21e9fff2c770c43742c8a8ef
+  metadata.gz: a0bb9e80092aff503373648fffa19326d05a9030e6c0cb0f2ec3c86ae7930f814139af289af5ffdbdd5e73c6460e0d8624b635d961a64d78f0e17be027d180db
+  data.tar.gz: adebc9074bb74fc6e2983e76a55948062485571856164116741a839ef2a6b3327528bbe08549ddaa52ce8c0dbd93ce22061d649ef533a1e0d5433256f8abcbef

data/.tool-versions

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

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,12 +110,20 @@ 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)
 

data/lib/solidus_bactracs/api/shipment_serializer.rb

@@ -13,9 +13,6 @@ module SolidusBactracs
       def call(sguid: nil)
         order = @shipment.order
         user = @shipment.user
-        rma_type = safe_rma_type
-        rp_location = get_rp_location
-        df_part = get_df_part
 
         xml = Builder::XmlMarkup.new
         xml.instruct!(:xml, :encoding => "UTF-8")
@@ -26,7 +23,7 @@ module SolidusBactracs
               xml.sGuid                       sguid
               xml.NewRMA {
                 xml.RMANumber                 @shipment.number
-                xml.RMATypeName               rma_type
+                xml.RMATypeName               safe_rma_type
                 xml.RMASubTypeName
                 xml.CustomerRef
                 xml.InboundShippingPriority
@@ -72,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)
@@ -95,8 +93,8 @@ module SolidusBactracs
           xml.WarrantyRepair
           xml.RMALineTest
           xml.InboundShipWeight       variant.weight.to_f
-          xml.RPLocation              rp_location
-          xml.DFPart                  df_part
+          xml.RPLocation              get_rp_location
+          xml.DFPart                  get_df_part
         }
       end
 
@@ -107,9 +105,8 @@ module SolidusBactracs
 
       def get_rp_location
         #Double verifing
-        return nil if rma_type == "4"
+        return nil if safe_rma_type == "4"
 
-        rp_location = @shipment.get_rma_rp_location if @shipment.get_rma_rp_location
         @config.default_rp_location.call(@shipment)
       end
 
@@ -119,7 +116,7 @@ module SolidusBactracs
 
       def get_df_part
         df_part =
-          if rma_type == "4"
+          if safe_rma_type == "4"
             @shipment.number
           else
             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.0'
+  VERSION = '3.5.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: solidus_bactracs
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.5.2
 platform: ruby
 authors:
 - Zeryab Ali
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-11-08 00:00:00.000000000 Z
+date: 2023-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty