valken-shipping 1.1.4 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa9324cff477a6c9ab22438c530c614b020f66e209ae5e50ac88f0ced04b7a49
-  data.tar.gz: 0dc95eabe9d8fcfe12cd667288f9b0a84548b3e2ecf631d0a0b04189c1b20724
+  metadata.gz: c1b1ed71fdb852fdbd8b1ca1018fb950435b4860fe86fb6a06b6cff3b76da06d
+  data.tar.gz: 24da7f5bd45aee0254d206c949f7cac835fa74ee2e98d18135eb5cd046bc7c0f
 SHA512:
-  metadata.gz: 5e8b065cc02c8af0d8ecee5a34ea80fcb7f6d86fe3e22ed6d2824513c956637404f8bc4973bcbfe3afa5851fa6e58423bf2e8de2227ee26a0c336bbf4078eae0
-  data.tar.gz: 34f59bb3e5fdb30bdf227120aca4b1d71016b5af15b79a094d9c5d9c3d8a02f4ac47d5a7ef0e1aa1303c0a4489b40bde4de86a425a75dd40e02fa40dfe37be94
+  metadata.gz: fabbba71a4d896abddc6b05797d8cd8fbbaa5eb9a2fa3a2066a0e4f93b0559c5d097a99d3f3bece098b4a229adf5615acff7f5dc84a652bfe2cec62430e52515
+  data.tar.gz: 4173b8f446c15d72b96f4df7856739a2b1b6fdd20b647e0855de69de5906448bd00050cea9a8d9f315961d5bb042cbe71b43a25408b56ced44406350179e3af3

data/app/models/workarea/checkout/shipping_options.decorator

@@ -12,12 +12,13 @@ module Workarea
     end
 
     def shipping_option
-      carrier_data = collect_carrier_data(selected_carrier)
+      carrier_data = []
       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_ltl_shipping)
       end
-      carrier_data
+      carrier_data.push(collect_carrier_data(selected_carrier))
+      carrier_data.flatten
     end
 
     # Selecting the shipping carrier based on order items 
@@ -79,7 +80,8 @@ module Workarea
     def get_free_shipping
     	ShippingOption.new(
         carrier: "Free Shipping",
-        name: "5 to 9 Day",
+        name: "Valken Economy",
+        sub_name: "5 - 9 Business Days",
         service_code: "Free",
         price: Money.new(0.0, "USD"),
         tax_code: "TAX01"
@@ -104,7 +106,8 @@ module Workarea
 
       ShippingOption.new(
         carrier: "LTL Shipping",
-        name: "3 to 5 Day",
+        name: "Valken Standard",
+        sub_name: "3 - 5 Business Days",
         service_code: "LTL01",
         price: Money.new(weight_price * 100, "USD"),
         tax_code: "TAX01"
@@ -158,24 +161,29 @@ module Workarea
 
       # find and sort all delivery dates and pick 1st three
       all_delivery_dates  = rates.map { |rate| rate.delivery_date }
-      uniq_delivery_dates = all_delivery_dates.compact.sort.uniq[0..2]
+      # sorting the uniq delivery dates and reversing those delivery dates.
+      uniq_delivery_dates = all_delivery_dates.compact.sort.uniq[0..2].reverse
       
+      # removing overnight. Assuming the 3rd option is always overnight
+      uniq_delivery_dates.pop if uniq_delivery_dates.length == 3
+
       # For each delivery dates, find cheapest rates and create shipping option and push
       uniq_delivery_dates.each_with_index do |date, index|
         selected_rates = rates.select {|rate| rate.delivery_date.present? && rate.delivery_date == date}
         cheap_rate = selected_rates.sort_by(&:price).first
-        description = "#{cheap_rate.delivery_date.strftime('%a, %d %b %Y')}"
-        shipping_option = create_shipping_options(cheap_rate, service_code[index], description)
+        description = "#{cheap_rate.delivery_date.strftime('%A, %B %d, %Y')}"
+        shipping_option = create_shipping_options(cheap_rate, service_code[index], description, Workarea.config.shipping_rates[index])
         filtered_rates.push(shipping_option)
       end
       filtered_rates
     end
 
     # creating a ShippingOption
-    def create_shipping_options(rate, rate_label = nil, description = nil)
+    def create_shipping_options(rate, rate_label = nil, description = nil, sub_name)
       ShippingOption.new(
           carrier: rate.carrier,
-          name: rate_label || rate.service_name,
+          name: rate_label.keys.join || rate.service_name,
+          sub_name: sub_name.values.join,
           service_code: rate.service_code,
           description: description,
           price: Money.new(rate.price, rate.currency),
@@ -185,7 +193,5 @@ module Workarea
           )
         )
     end
-
-    
   end
 end

data/app/models/workarea/shipping_option.decorator

@@ -1,7 +1,7 @@
 module Workarea
   decorate ShippingOption, with: :valken do
     decorated do 
-      attr_reader :description
+      attr_reader :description, :sub_name
     end
 
     class_methods do

data/config/initializers/workarea.rb

@@ -3,13 +3,11 @@ Workarea.configure do |config|
 
   config.weight_table = {"2": 5, "15": 15, "200": 1, "2500": 200}
 
-  
   config.shipping_rates = [
-    "Overnight",
-    "2 Day",
-    "3 Day"
+    {"Valken Express 3-Day" => "3 Business Days"},
+    {"Valken Express 2-Day" => "2 Business Days"}
   ]
-  config.ups_options = {"12"=> "3 Day", "01"=> "Overnight", "02"=> "2 Day"}
-  config.fedex_options = {"STANDARD_OVERNIGHT"=> "Overnight", "FEDEX_2_DAY"=> "2 Day", "GROUND_HOME_DELIVERY"=> "3 Day"}
+  config.ups_options = {"12"=> "Valken Express 3-Day", "01"=> "Valken Overnight", "02"=> "Valken Express 2-Day"}
+  config.fedex_options = {"STANDARD_OVERNIGHT"=> "Valken Overnight", "FEDEX_2_DAY"=> "Valken Express 2-Day", "GROUND_HOME_DELIVERY"=> "Valken Express 3-Day"}
 end
 Valken::Shipping.auto_initialize_gateway

data/lib/valken/shipping/version.rb

@@ -1,5 +1,5 @@
 module Valken
   module Shipping
-    VERSION = '1.1.4'
+    VERSION = '1.1.9'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valken-shipping
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.9
 platform: ruby
 authors:
 - sushmitha02
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2020-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails