valken-shipping 2.0.4 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de87f21281f76ad4ff9f00e829c028e2e1ba1f4813c821d89664f11024725171
-  data.tar.gz: 98658fd8e5aef01ad8f763751cb577ee5ca2fd94818605926a49713dce77be23
+  metadata.gz: dc10c599481dc98cee8685adb0b8b321b27e49461965605af4f5b326fdbe73d5
+  data.tar.gz: 8841aaf757d728ca2eb93845fb8e38bf95f9a5e7fbf8c848850997fce824fb4e
 SHA512:
-  metadata.gz: 7c6dd426e9a1631da60b4c1acd121ac0ace51837c7e94c5bf06e18a8698c7a8b0cdbc113c7f28962cd8b65f9922e388fc5ff3db6a17f4e49fd31c325bf8ce0ed
-  data.tar.gz: 6c7fa9cd69747eb934f40231ebc829aea8a0c0d60705c5bb172f9d5296bc3ede35a2c2c490a3a88adf6853de0edb5957f537b968c7d12ede5c6f8ec0f9288c9b
+  metadata.gz: 601e1c833f65e3dc73746c42ec82794c132bb15af5bcdf9ec78dd5dae7e3004d102625943202f127fa19b6a35d94626d6c5f95d272396bd1fe28db488b59cb4c
+  data.tar.gz: 6796e2e1c7c0a16d6097908c0b1619cd76c055af403d4adbc356033bc5f84b577aeb289792a1f11aa8b4a537f5bed925cbd88ade4fe997be306fb441e326fdd4

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,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
@@ -41,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

@@ -41,6 +41,10 @@ module Workarea
 
       return default_options(packaging.packages) if Workarea.config.gateways.ups_carrier.class == ActiveShipping::Workarea
 
+      if is_special_region?
+          return [get_shipping_for_special_region]
+      end
+
       shipping_options_api = get_final_shipping_options(collect_carrier_data)
       return [] if @error.present?
 
@@ -81,9 +85,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.
@@ -150,6 +155,30 @@ module Workarea
       )
     end
 
+    def get_shipping_for_special_region
+      puts "weight_convertion",weight_convertion
+      weight_price = 0
+      case weight_convertion
+      when 0..15
+        weight_price = 50
+      when 15..200
+        weight_price = (1 * weight_convertion)
+      when 200..2500
+        weight_price = 200
+      else
+        weight_price = ((weight_convertion / 2500).ceil()) * 200
+      end
+
+      ShippingOption.new(
+        carrier: "LTL Shipping",
+        name: "Valken Standard",
+        sub_name: "3 - 5 Business Days",
+        service_code: "LTL01",
+        price: Money.new(weight_price * 100, "USD"),
+        tax_code: "TAX01"
+      )
+    end
+
     # Returns the total weight.
     def weight_convertion
       packaging = Packaging.new(order, shipping)
@@ -252,7 +281,11 @@ module Workarea
       product_carrier_type = product_details.map{ |item| item[:en][ground_ship_attribute] }.flatten
       product_carrier_type.include?("true")
     end
-  
+    
+    def is_special_region?
+      Workarea.config.special_region.include?(@shipping.address.region)
+    end
+
     def product_details
       # product_attributes   = @order.items.map(&:product_attributes)
 

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.4'
+    VERSION = '2.0.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valken-shipping
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.9
 platform: ruby
 authors:
 - sushmitha02
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-11 00:00:00.000000000 Z
+date: 2020-10-05 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