valken-shipping 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa9324cff477a6c9ab22438c530c614b020f66e209ae5e50ac88f0ced04b7a49
-  data.tar.gz: 0dc95eabe9d8fcfe12cd667288f9b0a84548b3e2ecf631d0a0b04189c1b20724
+  metadata.gz: 7608c70f08d733b5da90794c417ad5bc0b70a85ec6250fe8803f97359e5d6f6a
+  data.tar.gz: d3ff069bfa00e8bba8e8ff3c5a286bd52d837062d8abaa08c0230c497346c439
 SHA512:
-  metadata.gz: 5e8b065cc02c8af0d8ecee5a34ea80fcb7f6d86fe3e22ed6d2824513c956637404f8bc4973bcbfe3afa5851fa6e58423bf2e8de2227ee26a0c336bbf4078eae0
-  data.tar.gz: 34f59bb3e5fdb30bdf227120aca4b1d71016b5af15b79a094d9c5d9c3d8a02f4ac47d5a7ef0e1aa1303c0a4489b40bde4de86a425a75dd40e02fa40dfe37be94
+  metadata.gz: 140ef76ea1c80c5ecc8acc17e8553d725a648d005fd460e3b866224ac934c328637da2597c98f6bae5982a9bb0fcb6778fe78f6a646adfe485fa9659edb4f647
+  data.tar.gz: 601497d3f3e14b71ddd8efeadae6f9830d51d0ecb318e9a4d9b7b5329bc1f0f1be288aeefc9723a38252a0f1c0f8f877f2369d3d3b8fe6e8f18d7ba990f3b7cb

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

@@ -79,7 +79,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 +105,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"
@@ -164,7 +166,7 @@ module Workarea
       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')}"
+        description = "#{cheap_rate.delivery_date.strftime('%A, %B %d, %Y')}"
         shipping_option = create_shipping_options(cheap_rate, service_code[index], description)
         filtered_rates.push(shipping_option)
       end
@@ -175,7 +177,8 @@ module Workarea
     def create_shipping_options(rate, rate_label = nil, description = nil)
       ShippingOption.new(
           carrier: rate.carrier,
-          name: rate_label || rate.service_name,
+          name: Workarea.config.shipping_rates[0].keys[0],
+          sub_name: Workarea.config.shipping_rates[0].values[0],
           service_code: rate.service_code,
           description: description,
           price: Money.new(rate.price, rate.currency),
@@ -185,7 +188,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 Overnight" => "Overnight"},
+    {"Valken Express 2-Day" => "2 Business Days"},
+    {"Valken Express 3-Day" => "3 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.5'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: valken-shipping
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - sushmitha02