valken-shipping 1.1.3 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 836864919e7e6f3dcb1762f14ea620afd0c56429040ad133fa7b01bf032cc6a3
-  data.tar.gz: 1f0addf9f86025e5f59232cbce1cdefd9dd7b56709969823264c3e50578251b8
+  metadata.gz: 1f96335c5b53614036b3991c54ec307ace739a6991fbb3c1e4dd98a957a3afb6
+  data.tar.gz: 5d7a5f6347d2edcd2d46e4053e78843c47055b64d076f448da69593dc097b3df
 SHA512:
-  metadata.gz: 465f4ab7305bc7c8efa1e8de744ff6a058f05f0afe389d91e8a0f79a126d12c9a2ba5109869fc39bdda63a4027c78742f6711c37a8e7aa57b2c283735ce4b9c6
-  data.tar.gz: ba70cb673db53d2c44ec47ffec89785538e9fbe1e78acca8599bcecf7d0233ca1849f979c811b17348631918a953e6f6f3ab34595eb35cda55aa43506c479c37
+  metadata.gz: a449dc97ab566e2c2f7b30b40613b042497560ef503d7a9d4471029ead334b41001918436537942321c16f00d438502996d13fb3ac2859e0fbcab9b03807799e
+  data.tar.gz: db9b1c8f6766e75284cb9023e606ae034867f14fd239316c7484ea7d514d255fb132dae2d1c978613226b38d50072942446554eb3be366fa3fc97fd093b25ba6

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_free_shipping) if Workarea.config.show_free_shipping
         carrier_data.push(get_ltl_shipping)
-        carrier_data.push(get_free_shipping)
       end
-      carrier_data
+      carrier_data.push(collect_carrier_data(selected_carrier))
+      carrier_data.flatten
     end
 
     # Selecting the shipping carrier based on order items 
@@ -27,11 +28,11 @@ module Workarea
     def selected_carrier
       product_ids = order.items.to_a.map(&:product_id)
       product_details = Catalog::Product.in(id: product_ids).pluck(:details)
-      is_hazmat = product_details.any? {|item| item["en"]["Type"] && item["en"]["Type"].first == "Hazmat"}
-      is_gun = product_details.any? {|item| item["en"]["Type"] && item["en"]["Type"].first == "Gun"}
-      return "UPS" if is_hazmat
-      return "FedEx" if is_gun
-      return "none" unless is_hazmat && is_gun
+      is_ups = product_details.any? {|item| item["en"]["Type"] && item["en"]["Type"].first == "UPS"}
+      is_fedex = product_details.any? {|item| item["en"]["Type"] && item["en"]["Type"].first == "FEDEX"}
+      return "UPS" if is_ups
+      return "FedEx" if is_fedex
+      return "none" unless is_ups && is_fedex
     end
 
     # If the carrier is ups then it will print ups data...or if carrier is fedex then prinnt fedex data...
@@ -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,26 @@ 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
       
       # 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 +190,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,12 @@ 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"},
+    {"Valken Overnight" => "Overnight"}
   ]
-  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.3'
+    VERSION = '1.1.8'
   end
 end

metadata

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