valken-shipping 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21a15ea0992134b70026f5e873cce4752bb2d208b45c33f89f6fd105bfb09a01
-  data.tar.gz: a975398b63c62662d7dc1d5de4238298e12377b9d10867dd56cadc0e5fc7149f
+  metadata.gz: 1f96335c5b53614036b3991c54ec307ace739a6991fbb3c1e4dd98a957a3afb6
+  data.tar.gz: 5d7a5f6347d2edcd2d46e4053e78843c47055b64d076f448da69593dc097b3df
 SHA512:
-  metadata.gz: 600c74fd671573e899bd8a8a527a04ba19057fd0f9049828336ca9261898501a1d876ff87257ea4b54cdfde99e949524f4a8e21fdbc17047e1457b5a896df84c
-  data.tar.gz: 875c6a24365e57ebd4374ac33cf4ce9f6af884414afd083bed38c9a737adc0a83989cd96a658ca828df0dab6a0b70417e795b4829bf5e631bc5a178fee7222b8
+  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_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 
@@ -160,7 +161,8 @@ 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|

data/config/initializers/workarea.rb

@@ -4,9 +4,9 @@ Workarea.configure do |config|
   config.weight_table = {"2": 5, "15": 15, "200": 1, "2500": 200}
 
   config.shipping_rates = [
-    {"Valken Overnight" => "Overnight"},
+    {"Valken Express 3-Day" => "3 Business Days"},
     {"Valken Express 2-Day" => "2 Business Days"},
-    {"Valken Express 3-Day" => "3 Business Days"}
+    {"Valken Overnight" => "Overnight"}
   ]
   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"}

data/lib/valken/shipping/version.rb

@@ -1,5 +1,5 @@
 module Valken
   module Shipping
-    VERSION = '1.1.7'
+    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.7
+  version: 1.1.8
 platform: ruby
 authors:
 - sushmitha02
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-11 00:00:00.000000000 Z
+date: 2020-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails