valken-shipping 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: facbbed02fb6c396fc8d3ac4b5337f594e2de0cbe20e8fd37b0ff7306a447ad5
-  data.tar.gz: 96c4bd79d896be2a57108a03ee97eb79ba9115899fa0697cf48d7ba4e22cdaf9
+  metadata.gz: bdf90fc1027419e570161039b4015727c9c98e2f48cb25c2dc386eaf97adfe08
+  data.tar.gz: 12b3131e650b4fd8ff8378c634d7a016490db586cece0559cdce26158b329d7b
 SHA512:
-  metadata.gz: 8a787f46ac3afab8fb25d440947ed897fe6bbae8e5c24166ef4446bbbe7144e9e2784dc64144bf90ab27a04245ca62ca75a071584e03d405ba24fcb8735afcfa
-  data.tar.gz: 7ca413454ff6e3d406101074318ea9e3313d051f676fd1a1b69ddc66d1d2aff0c40d9ecf64fb35a1680b27726071f4e37e076d3a1778fe24f8ceb24d1af51e7f
+  metadata.gz: 59bdeb5734e355f53fa91aac81c6b6ae747dd30c6c3772e6e59e6f0134e26d46c78897c11d849d829db41e8d1a39948d7d724d26d42d8f7dd104f51c1f33152a
+  data.tar.gz: 84e5b3769cb38a9b4f750443d081b419459667aa65bd0a9b5292210b194d2e05aebe1031c0c7c036555c03eb8d4db5292c70ddb69900d9d5b4ff9105ad985f86

data/app/helpers/workarea/addresses_helper.rb

@@ -12,7 +12,14 @@ 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
@@ -40,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,10 +81,9 @@ 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
-      # Temporarily disabling fedex and cheaper
-      # return get_fedex_data if is_fedex
-      # return get_none_data unless is_ups && is_fedex
+      return get_ups_data if is_ups
+      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/lib/valken/shipping/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valken-shipping
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 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.8
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: shipping options