valken-shipping 2.0.1 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f92653930081ded5658da35cbc0c04e556b15cf001fab963f589ebaf86501a88
-  data.tar.gz: 7996b9957c6aec16a394f4a772aa650410613c88819569536a8cf1585567c5a2
+  metadata.gz: bdf90fc1027419e570161039b4015727c9c98e2f48cb25c2dc386eaf97adfe08
+  data.tar.gz: 12b3131e650b4fd8ff8378c634d7a016490db586cece0559cdce26158b329d7b
 SHA512:
-  metadata.gz: 24df18e3b0c8db49d6074ecb675c59aa450b62cbfd7849a3446a65e21474f817ea51b82aef96b25a857dc2cd4b9fc7934edb59d465aeef8fe87954b91e38d492
-  data.tar.gz: 8e6b3cce596b96e97f1ade2081b0fa54ed429581806e0d45f776d1a89ced2cb8279fc685341823628d901b839c74b90a1a9879d8d565319ff7da75f0de789828
+  metadata.gz: 59bdeb5734e355f53fa91aac81c6b6ae747dd30c6c3772e6e59e6f0134e26d46c78897c11d849d829db41e8d1a39948d7d724d26d42d8f7dd104f51c1f33152a
+  data.tar.gz: 84e5b3769cb38a9b4f750443d081b419459667aa65bd0a9b5292210b194d2e05aebe1031c0c7c036555c03eb8d4db5292c70ddb69900d9d5b4ff9105ad985f86

data/app/helpers/workarea/addresses_helper.rb

@@ -1,7 +1,6 @@
 module Workarea
   module AddressesHelper
     def country_options
-      return [[Country['US'].name, Country['US'].alpha2]] if is_usa_only?
       Workarea.config.countries.map do |country|
         [country.name, country.alpha2]
       end
@@ -13,17 +12,29 @@ module Workarea
                     .map { |id, region| [region.translations[I18n.locale.to_s] || region.name, id] }
                     .sort_by { |name, id| name || id }
 
-        memo << [country.name, regions]
+        if country.name == "United States of America"
+          region = regions.reject do |state|
+            Workarea.config.shipping_state_exclude.include?(state.last)
+          end
+          memo << [country.name, region]
+        else
+          memo << [country.name, regions]
+        end
         memo
       end
     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)
-      return product_attributes.map{ |item| item[:details][:en][usa_only_attribute] }.flatten.include?("true")
+      return product_details(orders).map{ |item| item[:en][usa_only_attribute] }.flatten.include?("true")
+    end
+
+    def product_details(orders)
+      @product_details ||= Catalog::Product.in(id: orders.items.to_a.map(&:product_id)).pluck(:details)
     end
 
     def formatted_address(address)
@@ -36,7 +47,6 @@ module Workarea
         postalcode: address.postal_code,
         country: address.country.alpha2
       }
-
       address_format = address.country.address_format || Country['US'].address_format
       result = pieces.reduce(address_format) do |memo, (name, value)|
         memo.gsub(/{{#{name}}}/, html_escape(value.to_s))

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/config/initializers/shipping_configuration.rb

@@ -8,5 +8,10 @@ Workarea::Configuration.define_fields do
         'ground_shipping_only' => 'ground shipping only'
       },
       description: 'Mapping of product details keys with shipping logic. Note: This maps only the keys not the values.'
+
+    field 'Shipping State Exclude',
+      type: :array,
+      default: ["AK", "HI", "PR"],
+      description: 'Shipping Excluded States'
   end
 end

data/config/initializers/workarea.rb

@@ -1,4 +1,7 @@
 Workarea.configure do |config|
+
+	config.countries = [Country['US']]
+
   ActiveShipping::Carriers.register :UPS,    'active_shipping/carriers/ups'
 
   config.weight_table = {"2": 5, "15": 15, "200": 1, "2500": 200}

data/lib/valken/shipping/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valken-shipping
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.7
 platform: ruby
 authors:
 - sushmitha02
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails