valken-shipping 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14b667ecf912e540effbb2b13c41a18d32022d9468f06645ea7ef521c03d7188
-  data.tar.gz: 9b97b46ad99cc5abf8c8eb6f7037f6fe9313e5a12039dc8485beeb4ee20290ce
+  metadata.gz: 836864919e7e6f3dcb1762f14ea620afd0c56429040ad133fa7b01bf032cc6a3
+  data.tar.gz: 1f0addf9f86025e5f59232cbce1cdefd9dd7b56709969823264c3e50578251b8
 SHA512:
-  metadata.gz: f53ed14462bf4cddf96725b82b902171d1ef96aa23bfe51dba53d2ae14a9adfb05e5c537b658075d6933923998fb240dde077b78fbdb82c2e9e5a62f5346edf1
-  data.tar.gz: bfcfad206f8656f9cf38ba0c581b0e74968d669ff0f7d7fd21aad7a169f006fb886c8ad24278213a59645dbc08e0c03b4690520cb85e6d462067e95d87d8b149
+  metadata.gz: 465f4ab7305bc7c8efa1e8de744ff6a058f05f0afe389d91e8a0f79a126d12c9a2ba5109869fc39bdda63a4027c78742f6711c37a8e7aa57b2c283735ce4b9c6
+  data.tar.gz: ba70cb673db53d2c44ec47ffec89785538e9fbe1e78acca8599bcecf7d0233ca1849f979c811b17348631918a953e6f6f3ab34595eb35cda55aa43506c479c37

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

@@ -150,36 +150,34 @@ module Workarea
       end
     end
 
-    # Get cheapest option from overnight, 2 day & 3 days shipping rates
+    # Sort rates by delevry date and pick 1st three rates
+    # Find cheapest rate for those three rates
     # Push all the cheap option for 1, 2, & 3 days into an array and return
     def filter_shipping_rates(rates, service_code)
       filtered_rates = []
 
-      overnight_option  = get_cheapest_option(rates, (Date.today() + 1), service_code[:overnight])
-      two_day_option    = get_cheapest_option(rates, (Date.today() + 2), service_code[:two_day])
-      three_day_option  = get_cheapest_option(rates, (Date.today() + 3), service_code[:three_day])
-
-      filtered_rates.push(overnight_option) if overnight_option.present?
-      filtered_rates.push(two_day_option)   if two_day_option.present?
-      filtered_rates.push(three_day_option) if three_day_option.present?
-
+      # 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]
+      
+      # 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)
+        filtered_rates.push(shipping_option)
+      end
       filtered_rates
     end
 
-    # Select all rates based on deliver date and given date
-    # Find cheapest rate from selected rates
-    # Create shipping option for cheatest rate
-    def get_cheapest_option(rates, date, label)
-      selected_rates   = rates.select { |item| item.delivery_date == date }
-      cheap_option     = create_shipping_options(selected_rates.sort_by(&:price).first, label) if selected_rates.length > 0
-    end
-
     # creating a ShippingOption
-    def create_shipping_options(rate, rate_label = nil)
+    def create_shipping_options(rate, rate_label = nil, description = nil)
       ShippingOption.new(
           carrier: rate.carrier,
           name: rate_label || rate.service_name,
           service_code: rate.service_code,
+          description: description,
           price: Money.new(rate.price, rate.currency),
           tax_code: Shipping::Service.find_tax_code(
             rate.carrier,

data/app/models/workarea/shipping_option.decorator

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

data/config/initializers/workarea.rb

@@ -3,11 +3,12 @@ Workarea.configure do |config|
 
   config.weight_table = {"2": 5, "15": 15, "200": 1, "2500": 200}
 
-  config.shipping_rates = {
-    :overnight => "Overnight",
-    :two_day => "2 Day",
-    :three_day => "3 Day"
-  }
+  
+  config.shipping_rates = [
+    "Overnight",
+    "2 Day",
+    "3 Day"
+  ]
   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"}
 end

data/lib/valken/shipping/version.rb

@@ -1,5 +1,5 @@
 module Valken
   module Shipping
-    VERSION = '1.1.2'
+    VERSION = '1.1.3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valken-shipping
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - sushmitha02
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2020-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -43,6 +43,7 @@ files:
 - app/assets/config/valken_shipping_manifest.js
 - app/models/workarea/checkout/shipping_options.decorator
 - app/models/workarea/shipping.decorator
+- app/models/workarea/shipping_option.decorator
 - app/services/workarea/packaging.decorator
 - config/initializers/workarea.rb
 - config/routes.rb