valken-shipping 1.1.1 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57a7395b28d67876810628798a91b4749cbabb1f6d441dcfd0dac802c3ceebbb
-  data.tar.gz: 5fd87c3d631dc6775d19b8264cf7011d4b72ae8c6faef59886fcb4bd9b06cb2f
+  metadata.gz: f7da22f8d6fc40becb3da5d39d703d7ad4f3c459b26c15f0332fdd6b6b2ad423
+  data.tar.gz: 6d06c92a47f4f45f6e14afd763e05db9086fb09ce464d5aea14a7fd3bc7c165c
 SHA512:
-  metadata.gz: 9e6b0c57e20a5f1ba8a654c31e7ef25415410e0fb5ece1f5270b74fdccfda2ad83cd4a90df9d3f804c68c2a70edfbbb032ac57499530623232e814a9980602e9
-  data.tar.gz: f7c17c654347b8283517945e19a7ccc9e4eac3bac25679ef594d2e3f7a754bb673ea2dcd6d1e74a6da952de0b2ba73fe21d618cf969b8bfec722f08aff43cfb9
+  metadata.gz: 3917e7fcd9e3e4c88ea4ca1a293dde0d980a6192ff815c33647cae783425596ddac4b6bd817e858d8ca3c501dfd7d6a6fec928598fd48c2ca0f37be9c9e88991
+  data.tar.gz: da3fd915a5cd8a84d25d8b8a6b6a5c861c3642e4cfca688da40cf71f649bd09c87a6a7d65f88ba892b2ea30e5f29ee7c86aa92942bf11da50e6bcb176abaf9c4

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...
@@ -57,12 +57,17 @@ module Workarea
       ups = get_ups_data.sort_by(&:price).first
       fedex = get_fedex_data.sort_by(&:price).first
 
-      return [] if ups.blank? && fedex.blank?
-      if ups.blank? || ups.price > fedex.price
+      if ups.present? && fedex.present?
+        if ups.price > fedex.price
+          return get_fedex_data
+        elsif ups.price < fedex.price
+          return get_ups_data
+        else
+          return get_ups_data
+        end
+      elsif ups.blank? 
         return get_fedex_data
-      elsif fedex.blank? || ups.price < fedex.price
-        return get_ups_data
-      elsif ups.price == fedex.price
+      elsif fedex.blank?
         return get_ups_data
       else
         return []
@@ -74,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"
@@ -99,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"
@@ -145,36 +152,36 @@ 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)
+      byebug
       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,
@@ -182,7 +189,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.1'
+    VERSION = '1.1.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valken-shipping
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.6
 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