valken-shipping 1.0.0 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b0fc21d3ef74613ab62ca3f5993836bc52c8ad229cf50039216de9b9bd01073
-  data.tar.gz: 65f121acd97813fa08a0b5d9f405894281cde213e6860c1c7593a8f6e5c10d63
+  metadata.gz: fa9324cff477a6c9ab22438c530c614b020f66e209ae5e50ac88f0ced04b7a49
+  data.tar.gz: 0dc95eabe9d8fcfe12cd667288f9b0a84548b3e2ecf631d0a0b04189c1b20724
 SHA512:
-  metadata.gz: ec65e99367d4da03661b12186d24bd29dfe1c44f2c80c5a7ac19388ee67ab60434ada4ba2c8ba120c1518a1c0bf8f0149d8eefb2eb6569e2312c5269cb157775
-  data.tar.gz: 7b045821a8865ca84fb2ee297e7717cbbc1309a37ad2fe990a0f6cdcfbca541cd57da8086338ad029937d5c46b35ae0a08af49b9170fea55363c3bba77373436
+  metadata.gz: 5e8b065cc02c8af0d8ecee5a34ea80fcb7f6d86fe3e22ed6d2824513c956637404f8bc4973bcbfe3afa5851fa6e58423bf2e8de2227ee26a0c336bbf4078eae0
+  data.tar.gz: 34f59bb3e5fdb30bdf227120aca4b1d71016b5af15b79a094d9c5d9c3d8a02f4ac47d5a7ef0e1aa1303c0a4489b40bde4de86a425a75dd40e02fa40dfe37be94

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,9 +57,17 @@ module Workarea
       ups = get_ups_data.sort_by(&:price).first
       fedex = get_fedex_data.sort_by(&:price).first
 
-      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
+      elsif fedex.blank?
         return get_ups_data
       else
         return []
@@ -122,7 +130,7 @@ module Workarea
       packaging = Packaging.new(order, shipping)
       return [] if shipping.address.blank? || packaging.packages.blank?
       shipping_option = carrier || Workarea.config.gateways.shipping
- 
+
       origin = ActiveShipping::Location.new(Workarea.config.shipping_origin)
       begin
         response = shipping_option.find_rates(
@@ -142,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.0.0'
+    VERSION = '1.1.4'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valken-shipping
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.4
 platform: ruby
 authors:
 - sushmitha02
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-28 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