solidus_backtracs 2.2.2 → 2.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d58f212b33488781331c666724e857474d6c60852d8acc845990b380c6727611
-  data.tar.gz: '09aacc1386429a22c7b953a7d09e192799fa8901c4a9b1fa26bb6fa9e744d995'
+  metadata.gz: 8eaad456d321e844cdd5f1112588824e31c9701d9bcc640c30088d6c22587547
+  data.tar.gz: 8c0804280eeabb82a52150bfb7bc3c5f5339f01a65c5bdc3d4a3f128bde1b724
 SHA512:
-  metadata.gz: d2b077b182bb182625eaa55567353d78c250e24f322dac1a6f31bad0ec262c5c5c8952a890b75914e212f55ae42f4a12b1fd19eddd9af0968a82fd3f986bddc2
-  data.tar.gz: bcf82e512fae4a40bc721aa7811440922815e0488feab5096d15e1a0da3c075935fb5a7e411b39a5e83ec9f44c048b1564028ec69aac6ac33456083899aaf366
+  metadata.gz: d9db7bc84e4beaab078dc2101438b2c5a85883631e2b36976d470a7bceb7a25cc98b12c79c0adaca8f8028f61a71d03bf23f5b129ebc646a8e22e1479b5b280e
+  data.tar.gz: c03655fd33aa0b06690345e5e0ed46a979108813889cbb1d8485fa8b33b006074ff99f30396269002f7052284196da85b73e601fc07988154a46d7fbfbf01d34

data/.gitignore

@@ -18,3 +18,5 @@ spec/examples.txt
 .rvmrc
 .ruby-version
 .ruby-gemset
+.tool-versions
+TAGS

data/app/helpers/solidus_backtracs/export_helper.rb

@@ -30,23 +30,30 @@ module SolidusBacktracs
     end
 
     def self.backtracs_address(xml, order, type)
-      name = "#{type.to_s.titleize}To"
-      address = order.send("#{type}_address")
-
-      xml.__send__(name) {
-        xml.CompanyName   address.company ? address.company : address.name
-        xml.Contact       address.name
-        xml.ContactEmail  order.email
-        xml.Address1      address.address1
-        xml.Address2      address.address2
-        xml.City          address.city
-        xml.State         address.state ? address.state.abbr : address.state_name
-        xml.Zip           address.zipcode
-        xml.Phone         address.phone.present? ? address.phone : "000-000-0000"
-        xml.PhoneAlt      address.phone.present? ? address.phone : "000-000-0000"
-        xml.Country       address.country.iso
-      }
-    end    
+      if type.present?
+        name = "#{type.to_s.titleize}To"
+        address = order.send("#{type}_address")
+
+        xml.__send__(name) {
+          xml.CompanyName   address.company ? address.company : address.name
+          xml.Contact       address.name
+          xml.ContactEmail  order.email
+          xml.Address1      address.address1
+          xml.Address2      address.address2
+          xml.City          address.city
+          xml.State         address.state ? address.state.abbr : address.state_name
+          xml.Zip           address.zipcode
+          xml.Phone         address.phone.present? ? address.phone : "000-000-0000"
+          xml.PhoneAlt      address.phone.present? ? address.phone : "000-000-0000"
+          xml.Country       address.country.iso
+        }
+      else
+        Rails.logger.info {
+          message: 'missing address type',
+          order: order.id,
+          type: type
+        }.to_s
+      end
     # rubocop:enable all
   end
 end

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

@@ -20,7 +20,14 @@ module SolidusBacktracs
       end
 
       def query_shipments
-        shipments = SolidusBacktracs::Shipment::PendingApiSyncQuery.apply(::Spree::Shipment.joins(inventory_units: [:variant]).where("spree_variants.sku" => SolidusBacktracs.config.shippable_skus).where("spree_shipments.state" => :ready).where.not(shipstation_order_id: nil).distinct)
+        shipments = SolidusBacktracs::Shipment::PendingApiSyncQuery.apply(
+          ::Spree::Shipment
+            .joins(inventory_units: [:variant])
+            .where("spree_variants.sku" => SolidusBacktracs.config.shippable_skus)
+            .where("spree_shipments.state" => :ready)
+            .where(backtracs_synced_at: nil)
+            .distinct
+        )
       end
     end
   end

data/lib/solidus_backtracs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusBacktracs
-  VERSION = '2.2.2'
+  VERSION = '2.2.5'
 end

data/spec/queries/solidus_backtracs/shipment/pending_api_sync_query_spec.rb

@@ -19,15 +19,15 @@ RSpec.describe SolidusBacktracs::Shipment::PendingApiSyncQuery do
         stub_configuration(api_sync_threshold: 10.minutes)
         shipment = create(:order_ready_to_ship).shipments.first.tap do |s|
           s.order.update_columns(updated_at: 7.minutes.ago)
-          s.update_columns(shipstation_synced_at: 8.minutes.ago)
+          s.update_columns(backtracs_synced_at: 8.minutes.ago)
         end
         create(:order_ready_to_ship).shipments.first.tap do |s|
           s.order.update_columns(updated_at: 9.minutes.ago)
-          s.update_columns(shipstation_synced_at: 8.minutes.ago)
+          s.update_columns(backtracs_synced_at: 8.minutes.ago)
         end
         create(:order_ready_to_ship).shipments.first.tap do |s|
           s.order.update_columns(updated_at: 11.minutes.ago)
-          s.update_columns(shipstation_synced_at: 10.minutes.ago)
+          s.update_columns(backtracs_synced_at: 10.minutes.ago)
         end
 
         expect(described_class.apply(Spree::Shipment.all)).to match_array([shipment])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backtracs
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.5
 platform: ruby
 authors:
 - Zeryab Ali
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-05-14 00:00:00.000000000 Z
+date: 2022-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty