valken-shipping 2.0.1 → 2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f92653930081ded5658da35cbc0c04e556b15cf001fab963f589ebaf86501a88
-  data.tar.gz: 7996b9957c6aec16a394f4a772aa650410613c88819569536a8cf1585567c5a2
+  metadata.gz: f9818be8a62cad5c315d34ab0f92ad3329e92cc783239a7e79eb2d0a1ef57ed6
+  data.tar.gz: b4ce33dbb4c6521fd0bba0aa7be81d14141bd44d6f9e98ab3b05580b418c8027
 SHA512:
-  metadata.gz: 24df18e3b0c8db49d6074ecb675c59aa450b62cbfd7849a3446a65e21474f817ea51b82aef96b25a857dc2cd4b9fc7934edb59d465aeef8fe87954b91e38d492
-  data.tar.gz: 8e6b3cce596b96e97f1ade2081b0fa54ed429581806e0d45f776d1a89ced2cb8279fc685341823628d901b839c74b90a1a9879d8d565319ff7da75f0de789828
+  metadata.gz: aefdbcffb8b51ff670231ad598a339fb4f8184f3670252d0d982136c5b13c834a913dd8db3b581b72bf89b9e393c1f77411e4e805b149042dd4ed72048453652
+  data.tar.gz: 676daa8bcf724b0c134e66bfc95ace4fa8be4ad3745c422badfd794c8ff64bae749e48ed87664a2896a54f00f52b33f3c8fb659f6aa2e804530a198befc3689c

data/app/helpers/workarea/addresses_helper.rb

@@ -19,10 +19,12 @@ module Workarea
     end
 
     def is_usa_only?
-      return false if current_order.blank? || current_order.items.blank?
+      
+      orders = current_order rescue nil
+      return false if orders.blank? || orders.items.blank?
 
       usa_only_attribute = Workarea.config.shipping_attributes[:usa_only]
-      product_attributes = current_order.items.map(&:product_attributes)
+      product_attributes = orders.items.map(&:product_attributes)
       return product_attributes.map{ |item| item[:details][:en][usa_only_attribute] }.flatten.include?("true")
     end
 

data/app/models/workarea/shipping.decorator

@@ -15,12 +15,33 @@ module Workarea
       @shipping
     end
 
+
+    def default_options(packages)
+      return [] if address.blank? || packages.blank?
+      shipping_option = Workarea.config.gateways.shipping
+
+      origin = ActiveShipping::Location.new(Workarea.config.shipping_origin)
+      response = shipping_option.find_rates(
+        origin,
+        address.to_active_shipping,
+        packages
+      )
+      response.rates.sort_by(&:price).map do |rate|
+        ShippingOption.from_rate_estimate(rate)
+      end
+    end
+
     def find_method_options(order, shipping)
       @order ||= order
       @shipping ||= shipping
       carrier_data = []
-      shipping_options_api = get_final_shipping_options(collect_carrier_data)
 
+      packaging = Packaging.new(order, shipping)
+      return [] if packaging.packages.blank?
+
+      return default_options(packaging.packages) if Workarea.config.gateways.ups_carrier.class == ActiveShipping::Workarea
+
+      shipping_options_api = get_final_shipping_options(collect_carrier_data)
       return [] if @error.present?
 
       carrier_data.push(shipping_options_api) if shipping_options_api.present? && shipping_options_api.any?

data/lib/valken/shipping/version.rb

@@ -1,5 +1,5 @@
 module Valken
   module Shipping
-    VERSION = '2.0.1'
+    VERSION = '2.0.3'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valken-shipping
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.3
 platform: ruby
 authors:
 - sushmitha02
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: shipping options