valken-shipping 2.0.3 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f9818be8a62cad5c315d34ab0f92ad3329e92cc783239a7e79eb2d0a1ef57ed6
-  data.tar.gz: b4ce33dbb4c6521fd0bba0aa7be81d14141bd44d6f9e98ab3b05580b418c8027
+  metadata.gz: b68ecff826d216873de1e906063c2c349d0a9d3c0e23581a90eb05831c67e5a7
+  data.tar.gz: 4967817ff6b397f68a9ad7237acd167d9c3ffe8e3e0434dd053864ddc5539ec5
 SHA512:
-  metadata.gz: aefdbcffb8b51ff670231ad598a339fb4f8184f3670252d0d982136c5b13c834a913dd8db3b581b72bf89b9e393c1f77411e4e805b149042dd4ed72048453652
-  data.tar.gz: 676daa8bcf724b0c134e66bfc95ace4fa8be4ad3745c422badfd794c8ff64bae749e48ed87664a2896a54f00f52b33f3c8fb659f6aa2e804530a198befc3689c
+  metadata.gz: 123282661e08331848b3442c0ae389c86efd1ae767df922c70a1b7b93b4a90bb40317948b941dc30a588838d20c60baadfd351d98ce564eec95df35f1ef88997
+  data.tar.gz: 6c4c59add44238adecee109dc536897fab93a1c73dfb670f313a100713f0721b19c71affd633ae853cd6d45f7a0cc95cdb285b7206e1d4310308bd4748922377

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,19 +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?
-      
+
       orders = current_order rescue nil
       return false if orders.blank? || orders.items.blank?
 
       usa_only_attribute = Workarea.config.shipping_attributes[:usa_only]
-      product_attributes = orders.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)
@@ -38,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

@@ -81,9 +81,10 @@ module Workarea
     # If the carrier is ups then it will print ups data...or if carrier is fedex then prinnt fedex data...
     # else if it is not both then choose cheapest price.
     def collect_carrier_data
-      return get_ups_data if is_ups
-      return get_fedex_data if is_fedex
-      return get_none_data unless is_ups && is_fedex
+      return get_ups_data
+      # Temporarily disabling fedex and cheaper
+      # return get_fedex_data if is_fedex
+      # return get_none_data unless is_ups && is_fedex
     end
 
     # UPS data.

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.3'
+    VERSION = '2.0.8'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valken-shipping
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.8
 platform: ruby
 authors:
 - sushmitha02
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-07 00:00:00.000000000 Z
+date: 2020-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -72,7 +72,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: shipping options