valken-shipping 1.1.2 → 1.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14b667ecf912e540effbb2b13c41a18d32022d9468f06645ea7ef521c03d7188
-  data.tar.gz: 9b97b46ad99cc5abf8c8eb6f7037f6fe9313e5a12039dc8485beeb4ee20290ce
+  metadata.gz: 21a15ea0992134b70026f5e873cce4752bb2d208b45c33f89f6fd105bfb09a01
+  data.tar.gz: a975398b63c62662d7dc1d5de4238298e12377b9d10867dd56cadc0e5fc7149f
 SHA512:
-  metadata.gz: f53ed14462bf4cddf96725b82b902171d1ef96aa23bfe51dba53d2ae14a9adfb05e5c537b658075d6933923998fb240dde077b78fbdb82c2e9e5a62f5346edf1
-  data.tar.gz: bfcfad206f8656f9cf38ba0c581b0e74968d669ff0f7d7fd21aad7a169f006fb886c8ad24278213a59645dbc08e0c03b4690520cb85e6d462067e95d87d8b149
+  metadata.gz: 600c74fd671573e899bd8a8a527a04ba19057fd0f9049828336ca9261898501a1d876ff87257ea4b54cdfde99e949524f4a8e21fdbc17047e1457b5a896df84c
+  data.tar.gz: 875c6a24365e57ebd4374ac33cf4ce9f6af884414afd083bed38c9a737adc0a83989cd96a658ca828df0dab6a0b70417e795b4829bf5e631bc5a178fee7222b8

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

@@ -15,7 +15,7 @@ module Workarea
       carrier_data = collect_carrier_data(selected_carrier)
       if Workarea.config.gateways.ups_carrier.class != ActiveShipping::Workarea
         carrier_data.push(get_ltl_shipping)
-        carrier_data.push(get_free_shipping)
+        carrier_data.push(get_free_shipping) if Workarea.config.show_free_shipping
       end
       carrier_data
     end
@@ -27,11 +27,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 +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"
@@ -150,36 +152,35 @@ 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, %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
 
-    # 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, 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),
           tax_code: Shipping::Service.find_tax_code(
             rate.carrier,
@@ -187,7 +188,5 @@ module Workarea
           )
         )
     end
-
-    
   end
 end

data/app/models/workarea/shipping_option.decorator

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

data/config/initializers/workarea.rb

@@ -3,12 +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.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.shipping_rates = [
+    {"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"}
 end
 Valken::Shipping.auto_initialize_gateway

data/lib/valken/shipping/version.rb

@@ -1,5 +1,5 @@
 module Valken
   module Shipping
-    VERSION = '1.1.2'
+    VERSION = '1.1.7'
   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.7
 platform: ruby
 authors:
 - sushmitha02
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-31 00:00:00.000000000 Z
+date: 2020-08-11 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