valken-shipping 0.1.4 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e6737dc3d986324920e209163dbbd483d3c71326f1e648fb1aabce037532951e
-  data.tar.gz: 61ee46bf6044bc76d3151c4ed82881bc52c239a5852482970057838ef2efef91
+  metadata.gz: 14b667ecf912e540effbb2b13c41a18d32022d9468f06645ea7ef521c03d7188
+  data.tar.gz: 9b97b46ad99cc5abf8c8eb6f7037f6fe9313e5a12039dc8485beeb4ee20290ce
 SHA512:
-  metadata.gz: '05008742de8bd382a1f74d139941db9e2e865f7f7aee9f3b106e80f51c83f672a61d788cbe95d6239be6e49d9ee87534f7e138ebaf30138e79abd25909a14882'
-  data.tar.gz: 77a5fd5041ba0f282bf5a45897eb410fd5b56cbcc6b813495fb0e965c2413d6972687774d98bbbfe32ed0bab62ec10de3ac2d3b37ba83097bd4ffcdda80e8f03
+  metadata.gz: f53ed14462bf4cddf96725b82b902171d1ef96aa23bfe51dba53d2ae14a9adfb05e5c537b658075d6933923998fb240dde077b78fbdb82c2e9e5a62f5346edf1
+  data.tar.gz: bfcfad206f8656f9cf38ba0c581b0e74968d669ff0f7d7fd21aad7a169f006fb886c8ad24278213a59645dbc08e0c03b4690520cb85e6d462067e95d87d8b149

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,48 +111,74 @@ 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
 
-    def create_shipping_options(rate, service_code)
+    # Get cheapest option from overnight, 2 day & 3 days shipping 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?
+
+      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)
       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,
           price: Money.new(rate.price, rate.currency),
           tax_code: Shipping::Service.find_tax_code(
@@ -139,5 +187,7 @@ module Workarea
           )
         )
     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)
-      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,12 @@ 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 => "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"}
 end
 Valken::Shipping.auto_initialize_gateway

data/lib/valken/shipping/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valken-shipping
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 1.1.2
 platform: ruby
 authors:
 - sushmitha02
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-01 00:00:00.000000000 Z
+date: 2020-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails