valken-shipping 2.0.7 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdf90fc1027419e570161039b4015727c9c98e2f48cb25c2dc386eaf97adfe08
-  data.tar.gz: 12b3131e650b4fd8ff8378c634d7a016490db586cece0559cdce26158b329d7b
+  metadata.gz: cacab064e89193c71c7ffa74746561806dd1c9deddf236d5265afe0ff6ffbf9a
+  data.tar.gz: 7f37d5f91091725b12bde5c42e2911153b8e567b3ac22a7cace9dcdfb1b9e30f
 SHA512:
-  metadata.gz: 59bdeb5734e355f53fa91aac81c6b6ae747dd30c6c3772e6e59e6f0134e26d46c78897c11d849d829db41e8d1a39948d7d724d26d42d8f7dd104f51c1f33152a
-  data.tar.gz: 84e5b3769cb38a9b4f750443d081b419459667aa65bd0a9b5292210b194d2e05aebe1031c0c7c036555c03eb8d4db5292c70ddb69900d9d5b4ff9105ad985f86
+  metadata.gz: 4016bbca645c3bcfbb45972f2e4658fb7bef550bc89ce877984992b64fa648800a10f5aff957358b857b36cd2c67ba976b1ed611fc18fe8a26e564c1bb3a7551
+  data.tar.gz: 5e24b58edbc20c129f7fb65cf06fe00add86a8bcecd8f9b0147856abc9041d6b1974f783f634982ac8f938eac5e66dbb70f72c3a91a1bd47e4aa9ec6f5bd84f4

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
@@ -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..50
+        weight_price = 50
+      when 50..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,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,7 +5,8 @@ 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.'
 

data/lib/valken/shipping/version.rb

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

metadata

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