valken-shipping 1.1.9 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1b1ed71fdb852fdbd8b1ca1018fb950435b4860fe86fb6a06b6cff3b76da06d
-  data.tar.gz: 24da7f5bd45aee0254d206c949f7cac835fa74ee2e98d18135eb5cd046bc7c0f
+  metadata.gz: ab3690dda426e4cf2d007e9c44872957323960c8457434bef1134c1f373194f4
+  data.tar.gz: 38f098df1c9aa7a8a83bbbb8fd52a34984aa0329fc8e248dc9337f5aeacb3d05
 SHA512:
-  metadata.gz: fabbba71a4d896abddc6b05797d8cd8fbbaa5eb9a2fa3a2066a0e4f93b0559c5d097a99d3f3bece098b4a229adf5615acff7f5dc84a652bfe2cec62430e52515
-  data.tar.gz: 4173b8f446c15d72b96f4df7856739a2b1b6fdd20b647e0855de69de5906448bd00050cea9a8d9f315961d5bb042cbe71b43a25408b56ced44406350179e3af3
+  metadata.gz: c629f3bc576ff4f7019966324569b77424d5d09e4af73928f5587c025fb1c2152d3224ca284d004b182b57ebaa736327d1ceb4683a022ed6299f8f3305a10ce1
+  data.tar.gz: eea6eb560252fef7fdd359b4ae4d59a277a7694c6dfa6c79708b5141d9f29ed1d4663e0782d8b5e02c075432b4f3a5b824bc4a0a8849bf92a4fb32f9b84ea1a1

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

@@ -12,13 +12,12 @@ module Workarea
     end
 
     def shipping_option
-      carrier_data = []
+      carrier_data = collect_carrier_data(selected_carrier)
       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) if Workarea.config.show_free_shipping
       end
-      carrier_data.push(collect_carrier_data(selected_carrier))
-      carrier_data.flatten
+      carrier_data
     end
 
     # Selecting the shipping carrier based on order items 
@@ -161,12 +160,8 @@ module Workarea
 
       # find and sort all delivery dates and pick 1st three
       all_delivery_dates  = rates.map { |rate| rate.delivery_date }
-      # sorting the uniq delivery dates and reversing those delivery dates.
-      uniq_delivery_dates = all_delivery_dates.compact.sort.uniq[0..2].reverse
+      uniq_delivery_dates = all_delivery_dates.compact.sort.uniq[0..2]
       
-      # 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}

data/app/models/workarea/shipping.decorator

@@ -1,6 +1,7 @@
 module Workarea
   decorate Shipping, with: :valken do
-    decorated do 
+    decorated do
+      field :tracking_number, type: String
     end
 
     class_methods do
@@ -9,7 +10,7 @@ module Workarea
     def find_method_options(packages, shipping_option)
       return [] if address.blank? || packages.blank?
       shipping_option = shipping_option || Workarea.config.gateways.shipping
- 
+
       origin = ActiveShipping::Location.new(Workarea.config.shipping_origin)
       response = shipping_option.find_rates(
         origin,

data/config/initializers/workarea.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valken-shipping
 version: !ruby/object:Gem::Version
-  version: 1.1.9
+  version: 2.0.0
 platform: ruby
 authors:
 - sushmitha02
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-30 00:00:00.000000000 Z
+date: 2020-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -70,7 +70,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