valken-shipping 2.0.6 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: facbbed02fb6c396fc8d3ac4b5337f594e2de0cbe20e8fd37b0ff7306a447ad5
-  data.tar.gz: 96c4bd79d896be2a57108a03ee97eb79ba9115899fa0697cf48d7ba4e22cdaf9
+  metadata.gz: b7149c7876c47dd7fd68ee128eb7f413d94ee777701a28a2c9e91359d1da6695
+  data.tar.gz: a7758713ae839296e086eed9aa57cf5532f00dabfe446b20d0e5f817b1fb3e12
 SHA512:
-  metadata.gz: 8a787f46ac3afab8fb25d440947ed897fe6bbae8e5c24166ef4446bbbe7144e9e2784dc64144bf90ab27a04245ca62ca75a071584e03d405ba24fcb8735afcfa
-  data.tar.gz: 7ca413454ff6e3d406101074318ea9e3313d051f676fd1a1b69ddc66d1d2aff0c40d9ecf64fb35a1680b27726071f4e37e076d3a1778fe24f8ceb24d1af51e7f
+  metadata.gz: 0a84318084bb273cb89745cff6b41cbcea9987fde4efce13a4b4f6c7357520335c701143aca2fd650b1de8a45be9033d34ab603749a4850d50413336267d5c61
+  data.tar.gz: 861c462c265b64a73481507abcf63694d0adb60e280459a3741521885b588206f60d84327006180c8a92a428827bf061d67223579e9fd2150e56c13fba3d63da

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

@@ -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,7 @@ 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
+        carrier_data.push(get_free_shipping) if is_free_ship
       else
         return []
       end
@@ -151,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)
@@ -253,7 +281,32 @@ 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
+
+    #  if any of the product is NO FREE SHIPPING = TRUE then return false
+    #  if free shipping config is then return true
+    #  if user applies free shipping promo code then return true
+    def is_free_ship
+      free_ship_attribute = Workarea.config.shipping_attributes[:no_free_shipping]
+      product_carrier_type = product_details.map{ |item| item[:en][free_ship_attribute] }.flatten
+      return false if product_carrier_type.include?("true")
+
+      return true if Workarea.config.show_free_shipping
+
+      test_order = order.clone
+      test_shipping = shipping.clone
+      test_shipping.apply_shipping_service(get_free_shipping.to_h)
+
+      price_adjustments = Pricing.find_shipping_discounts(
+        test_order,
+        test_shipping
+      )
+      return price_adjustments.present? && price_adjustments.any?
+    end
+
     def product_details
       # product_attributes   = @order.items.map(&:product_attributes)
 

data/config/initializers/shipping_configuration.rb

@@ -5,8 +5,14 @@ Workarea::Configuration.define_fields do
       default: {
         'usa_only' => 'usa only',
         'carrier_type' => 'Type',
-        'ground_shipping_only' => 'ground shipping only'
+        'ground_shipping_only' => 'ground shipping only',
+        'no_free_shipping' => 'no free shipping'
       },
       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.1.1'
   end
 end

metadata

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