valken-shipping 0.2.0 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a7479a62094f25d2a3bed078783fa64e87d1df2589126a5428139389d16a584
-  data.tar.gz: 62dbd43d9ecc4df5474ef1dd9a3e544885c72704f10c5d4611ed526ac1a5ebf7
+  metadata.gz: 836864919e7e6f3dcb1762f14ea620afd0c56429040ad133fa7b01bf032cc6a3
+  data.tar.gz: 1f0addf9f86025e5f59232cbce1cdefd9dd7b56709969823264c3e50578251b8
 SHA512:
-  metadata.gz: 2d6e57218303abfe50301f1c1d4d000f890af7f15293ed93c6ec735e16f57682c2a2b80a4d46eff1218d69f7632bc1782d7d7585faa566da097592be761c411f
-  data.tar.gz: bb00c7c168791983e2ab1d557de2d296b37a32bf5edf6ca0cfa5d8ca9ff5b78bbaf80a0fabdb51646af1a6d612d4209c215694863628735408003c689f4153f2
+  metadata.gz: 465f4ab7305bc7c8efa1e8de744ff6a058f05f0afe389d91e8a0f79a126d12c9a2ba5109869fc39bdda63a4027c78742f6711c37a8e7aa57b2c283735ce4b9c6
+  data.tar.gz: ba70cb673db53d2c44ec47ffec89785538e9fbe1e78acca8599bcecf7d0233ca1849f979c811b17348631918a953e6f6f3ab34595eb35cda55aa43506c479c37

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

@@ -20,6 +20,10 @@ module Workarea
       carrier_data
     end
 
+    # Selecting the shipping carrier based on order items 
+    # 
+    # If the product is type hazmat then it returns ups...or if product is type gun then it returns fedex
+    # else if product is not both type then it returns none
     def selected_carrier
       product_ids = order.items.to_a.map(&:product_id)
       product_details = Catalog::Product.in(id: product_ids).pluck(:details)
@@ -30,31 +34,48 @@ module Workarea
       return "none" unless is_hazmat && is_gun
     end
 
+    # If the carrier is ups then it will print ups data...or if carrier is fedex then prinnt fedex data...
+    # else if it is not both then choose cheapest price.
     def collect_carrier_data(carrier)
       return get_ups_data if carrier == "UPS"
       return get_fedex_data if carrier == "FedEx"
       return get_none_data if carrier == "none"
     end
 
+    # UPS data.
     def get_ups_data
-      ups_options = get_options(Workarea.config.gateways.ups_carrier, Workarea.config.ups_options)
+      @ups_options ||= get_options(Workarea.config.gateways.ups_carrier, Workarea.config.shipping_rates)
     end
 
+    # FedEx data.
     def get_fedex_data
-      fedex_response = get_options(Workarea.config.gateways.fedex_carrier, Workarea.config.fedex_options)
+      @fedex_response ||= get_options(Workarea.config.gateways.fedex_carrier, Workarea.config.shipping_rates)
     end
 
+    # If the product is not ups or fedex then it will choose the cheapest price among ups and fedex annd print the value.
     def get_none_data
-      ups = get_ups_data.first
-      fedex = get_fedex_data.first
-      return [] unless ups || fedex
-      if ups.price > fedex.price
+      ups = get_ups_data.sort_by(&:price).first
+      fedex = get_fedex_data.sort_by(&:price).first
+
+      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
-      else
+      elsif fedex.blank?
         return get_ups_data
+      else
+        return []
       end
+      
     end
 
+    # Free shipping option.
     def get_free_shipping
     	ShippingOption.new(
         carrier: "Free Shipping",
@@ -65,19 +86,20 @@ module Workarea
       )
     end
 
+    # Calculating the ltl shipping rates based on the conditions.
     def get_ltl_shipping
       weight_price = 0
-      case total_weight
+      case weight_convertion
       when 0..2
         weight_price = 5
       when 2..15
         weight_price = 15
       when 15..200
-        weight_price = (1 * total_weight)
+        weight_price = (1 * weight_convertion)
       when 200..2500
         weight_price = 200
       else
-        weight_price = ((total_weight / 2500).ceil()) * 200
+        weight_price = ((weight_convertion / 2500).ceil()) * 200
       end
 
       ShippingOption.new(
@@ -89,49 +111,73 @@ module Workarea
       )
     end
 
-    def total_weight
+    # Returns the total weight.
+    def weight_convertion
       packaging = Packaging.new(order, shipping)
       return 0 if packaging.packages.blank?
-      total_weight = 0
+      full_weight = 0
       packaging.packages.each do |item_package|
-        total_weight += item_package.weight.value
+        new_weight = item_package.weight.convert_to(:lb)
+        full_weight += new_weight.value
       end
-
-      total_weight
+      full_weight
     end
 
+    # 1. Sending a call to carrier and get shipping rates
+    # 2. Based on service codes in config, filter the shipping rates
+    # 3. If error, return empty array
     def get_options(carrier, service_code)
       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)
-      response = shipping_option.find_rates(
-        origin,
-        shipping.address.to_active_shipping,
-        packaging.packages
-      )
 
-      if carrier.class == ActiveShipping::Workarea
-        response.rates.sort_by(&:price).map do |rate|
-          ShippingOption.from_rate_estimate(rate)
-        end
-      else
-        filtered_options = []
-        response.rates.sort_by(&:price).each do |rate|
-          if service_code[rate.service_code].present?
-            filtered_options.push(create_shipping_options(rate, service_code))
+      origin = ActiveShipping::Location.new(Workarea.config.shipping_origin)
+      begin
+        response = shipping_option.find_rates(
+          origin,
+          shipping.address.to_active_shipping,
+          packaging.packages
+        )
+        if carrier.class == ActiveShipping::Workarea
+          response.rates.sort_by(&:price).map do |rate|
+            ShippingOption.from_rate_estimate(rate)
           end
+        else
+          filter_shipping_rates(response.rates, service_code)
         end
-        filtered_options
+      rescue ActiveShipping::ResponseError => e
+        return []
+      end
+    end
+
+    # 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 = []
+
+      # 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
 
-    def create_shipping_options(rate, service_code)
+    # creating a ShippingOption
+    def create_shipping_options(rate, rate_label = nil, description = nil)
       ShippingOption.new(
           carrier: rate.carrier,
-          name: service_code[rate.service_code] || rate.service_name,
+          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,
@@ -139,5 +185,7 @@ 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
+    end
+
+    class_methods do
+    end
+  end
+end

data/app/services/workarea/packaging.decorator

@@ -8,23 +8,20 @@ module Workarea
     end
 
     def find_sku_weight(sku)
-      sku_data = Catalog::Product.find_by_sku(sku).variants
-      sku = sku_data.detect {|variant| variant.sku == sku }
-      if is_pounds(sku)
-        convert_to_lb(sku.weight || 0)
-      else
-        sku.weight || 0
-      end
+      product_by_sku = Catalog::Product.find_by_sku(sku).variants
+      sku_data = product_by_sku.detect {|variant| variant.sku == sku }
+      sku_weight = is_pounds(sku_data) ? convert_to_lb(sku_data.weight || 0) : (sku_data.weight  || 0)
+      sku_weight
     end
 
     def convert_to_lb(weight)
       unit = Measured::Weight.new(weight, :lb)
-      unit.convert_to(:oz)
-      unit.value
+      ounce_unit = unit.convert_to(:oz)
+      ounce_unit.value
     end
 
-    def is_pounds(sku)
-      sku.weight_unit == "lb"
+    def is_pounds(sku_data)
+      sku_data.weight_unit == "lb"
     end
   end
 end

data/config/initializers/workarea.rb

@@ -3,7 +3,13 @@ Workarea.configure do |config|
 
   config.weight_table = {"2": 5, "15": 15, "200": 1, "2500": 200}
 
-  config.ups_options = {"01"=> "3 Day", "03"=> "Overnight", "02"=> "2 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
 Valken::Shipping.auto_initialize_gateway

data/lib/valken/shipping/version.rb

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

metadata

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