valken-shipping 2.0.9 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc10c599481dc98cee8685adb0b8b321b27e49461965605af4f5b326fdbe73d5
-  data.tar.gz: 8841aaf757d728ca2eb93845fb8e38bf95f9a5e7fbf8c848850997fce824fb4e
+  metadata.gz: 21051b703831eeb8b7db181812b3231971498df95778ce15ba3a8ba27fde910e
+  data.tar.gz: 751fcb5af0f175a504a61b4b08fabd6ea1db859b3f5b23d6c914cbeb7febebf1
 SHA512:
-  metadata.gz: 601e1c833f65e3dc73746c42ec82794c132bb15af5bcdf9ec78dd5dae7e3004d102625943202f127fa19b6a35d94626d6c5f95d272396bd1fe28db488b59cb4c
-  data.tar.gz: 6796e2e1c7c0a16d6097908c0b1619cd76c055af403d4adbc356033bc5f84b577aeb289792a1f11aa8b4a537f5bed925cbd88ade4fe997be306fb441e326fdd4
+  metadata.gz: 39793ffff0a296b60c70221ed76fdb19c1d8516f853efe6e773e779622f4c09bf6badcdf84dafec9676ed2791aee8f1119bcd5b0393143b109a06722b43a0d99
+  data.tar.gz: aa0d815b9d042f655377f468d8679dfa5d6572fe7776a4536fd877e29a717b2aac9cb889569560c782a882955399df48dd6a3ec9e090ce2f14771bfb2842c67d

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

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

data/lib/valken/shipping/version.rb

@@ -1,5 +1,5 @@
 module Valken
   module Shipping
-    VERSION = '2.0.9'
+    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.9
+  version: 2.1.0
 platform: ruby
 authors:
 - sushmitha02
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-10-05 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