valken-shipping 2.0.5 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43d1c8ec3f7d6af25efe3e0a3acf25e439987772d8118e6775c0ee4f147a4bcf
-  data.tar.gz: 156232c1e92cadbe56479771259ae8d1614f7cfbe1c0eb652824730af7841456
+  metadata.gz: 21051b703831eeb8b7db181812b3231971498df95778ce15ba3a8ba27fde910e
+  data.tar.gz: 751fcb5af0f175a504a61b4b08fabd6ea1db859b3f5b23d6c914cbeb7febebf1
 SHA512:
-  metadata.gz: f83375a1ff6d916416599be7c2c4770b7abaaa9ee3f431e3e736ff69ec0bf3acd7b0c2551f91347769db7957235a138d4246fc56e30059a68f1291a877101313
-  data.tar.gz: 1f4da466456726729188c7c802e9b295adc91196862172c33edf2e35634cfccd743b4032f7d2dc2ffa41911bed8b2999180faa71647b94ff4dff3b2653c64757
+  metadata.gz: 39793ffff0a296b60c70221ed76fdb19c1d8516f853efe6e773e779622f4c09bf6badcdf84dafec9676ed2791aee8f1119bcd5b0393143b109a06722b43a0d99
+  data.tar.gz: aa0d815b9d042f655377f468d8679dfa5d6572fe7776a4536fd877e29a717b2aac9cb889569560c782a882955399df48dd6a3ec9e090ce2f14771bfb2842c67d

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/checkout/shipping_options.decorator

@@ -12,5 +12,36 @@ module Workarea
         end
     end
 
+    # if configuration ON, show the free shipping
+    # Need to add the free shipping upfront to all options so that we can use that to get discounts
+    # if the dicount is not available we are removing the free shipping option
+    def available
+      @available ||= 
+        begin
+          all_options
+          all_options.unshift(get_free_shipping)
+          free_discount = price_adjustments["Valken Economy"]
+          if (free_discount.present? && free_discount.any?) || Workarea.config.show_free_shipping
+            all_options.first.price_adjustments = free_discount
+          else
+            all_options.shift()
+          end
+          all_options.each do |option|
+            option.price_adjustments = price_adjustments[option.name] || []
+          end
+        end
+    end
+
+    def get_free_shipping
+    	ShippingOption.new(
+        carrier: "Free Shipping",
+        name: "Valken Economy",
+        sub_name: "5 - 9 Business Days",
+        service_code: "Free",
+        price: Money.new(0.0, "USD"),
+        tax_code: "TAX01"
+      )
+    end
+
   end
 end

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?
 
@@ -48,7 +52,6 @@ module Workarea
 
       if Workarea.config.gateways.ups_carrier.class != ActiveShipping::Workarea
         carrier_data.push(get_ltl_shipping)
-        carrier_data.push(get_free_shipping) if Workarea.config.show_free_shipping
       else
         return []
       end
@@ -81,9 +84,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 +154,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 +280,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/lib/valken/shipping/version.rb

@@ -1,5 +1,5 @@
 module Valken
   module Shipping
-    VERSION = '2.0.5'
+    VERSION = '2.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valken-shipping
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.1.0
 platform: ruby
 authors:
 - sushmitha02
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-14 00:00:00.000000000 Z
+date: 2020-10-14 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.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: shipping options