valken-shipping 2.0.0 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab3690dda426e4cf2d007e9c44872957323960c8457434bef1134c1f373194f4
-  data.tar.gz: 38f098df1c9aa7a8a83bbbb8fd52a34984aa0329fc8e248dc9337f5aeacb3d05
+  metadata.gz: facbbed02fb6c396fc8d3ac4b5337f594e2de0cbe20e8fd37b0ff7306a447ad5
+  data.tar.gz: 96c4bd79d896be2a57108a03ee97eb79ba9115899fa0697cf48d7ba4e22cdaf9
 SHA512:
-  metadata.gz: c629f3bc576ff4f7019966324569b77424d5d09e4af73928f5587c025fb1c2152d3224ca284d004b182b57ebaa736327d1ceb4683a022ed6299f8f3305a10ce1
-  data.tar.gz: eea6eb560252fef7fdd359b4ae4d59a277a7694c6dfa6c79708b5141d9f29ed1d4663e0782d8b5e02c075432b4f3a5b824bc4a0a8849bf92a4fb32f9b84ea1a1
+  metadata.gz: 8a787f46ac3afab8fb25d440947ed897fe6bbae8e5c24166ef4446bbbe7144e9e2784dc64144bf90ab27a04245ca62ca75a071584e03d405ba24fcb8735afcfa
+  data.tar.gz: 7ca413454ff6e3d406101074318ea9e3313d051f676fd1a1b69ddc66d1d2aff0c40d9ecf64fb35a1680b27726071f4e37e076d3a1778fe24f8ceb24d1af51e7f

data/app/helpers/workarea/addresses_helper.rb

@@ -0,0 +1,61 @@
+module Workarea
+  module AddressesHelper
+    def country_options
+      Workarea.config.countries.map do |country|
+        [country.name, country.alpha2]
+      end
+    end
+
+    def region_options
+      @region_options ||= Workarea.config.countries.reduce([]) do |memo, country|
+        regions = country.subdivisions
+                    .map { |id, region| [region.translations[I18n.locale.to_s] || region.name, id] }
+                    .sort_by { |name, id| name || id }
+
+        memo << [country.name, regions]
+        memo
+      end
+    end
+
+    def is_usa_only?
+
+      orders = current_order rescue nil
+      return false if orders.blank? || orders.items.blank?
+
+      usa_only_attribute = Workarea.config.shipping_attributes[:usa_only]
+      return product_details(orders).map{ |item| item[:en][usa_only_attribute] }.flatten.include?("true")
+    end
+
+    def product_details(orders)
+      @product_details ||= Catalog::Product.in(id: orders.items.to_a.map(&:product_id)).pluck(:details)
+    end
+
+    def formatted_address(address)
+      pieces = {
+        recipient: "#{address.first_name} #{address.last_name}\n#{address.company}".strip,
+        street: "#{address.street} #{address.street_2}".strip,
+        city: address.city,
+        region: address.region_name,
+        region_short: address.region,
+        postalcode: address.postal_code,
+        country: address.country.alpha2
+      }
+
+      address_format = address.country.address_format || Country['US'].address_format
+      result = pieces.reduce(address_format) do |memo, (name, value)|
+        memo.gsub(/{{#{name}}}/, html_escape(value.to_s))
+      end
+
+      if address.phone_number.present?
+        formatted_phone = number_to_phone(
+          address.phone_number,
+          extension: address.phone_extension
+        )
+
+        result << "\n#{formatted_phone}"
+      end
+
+      result.gsub(/\n/, tag(:br)).html_safe
+    end
+  end
+end

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

@@ -1,192 +1,16 @@
 module Workarea
   decorate Checkout::ShippingOptions, with: :valken do
     decorated do
+      class NoAvailableShippingOption < RuntimeError; end
     end
 
     def all_options
       @all_options ||=
         begin
           packaging = Packaging.new(order, shipping)
-          shipping_option
+          shipping.find_method_options(order, shipping)
         end
     end
 
-    def shipping_option
-      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) if Workarea.config.show_free_shipping
-      end
-      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)
-      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...
-    # 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.shipping_rates)
-    end
-
-    # FedEx data.
-    def get_fedex_data
-      @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.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
-      elsif fedex.blank?
-        return get_ups_data
-      else
-        return []
-      end
-      
-    end
-
-    # Free shipping option.
-    def get_free_shipping
-    	ShippingOption.new(
-        carrier: "Free Shipping",
-        name: "Valken Economy",
-        sub_name: "5 - 9 Business Days",
-        service_code: "Free",
-        price: Money.new(0.0, "USD"),
-        tax_code: "TAX01"
-      )
-    end
-
-    # Calculating the ltl shipping rates based on the conditions.
-    def get_ltl_shipping
-      weight_price = 0
-      case weight_convertion
-      when 0..2
-        weight_price = 5
-      when 2..15
-        weight_price = 15
-      when 15..200
-        weight_price = (1 * weight_convertion)
-      when 200..2500
-        weight_price = 200
-      else
-        weight_price = ((weight_convertion / 2500).ceil()) * 200
-      end
-
-      ShippingOption.new(
-        carrier: "LTL Shipping",
-        name: "Valken Standard",
-        sub_name: "3 - 5 Business Days",
-        service_code: "LTL01",
-        price: Money.new(weight_price * 100, "USD"),
-        tax_code: "TAX01"
-      )
-    end
-
-    # Returns the total weight.
-    def weight_convertion
-      packaging = Packaging.new(order, shipping)
-      return 0 if packaging.packages.blank?
-      full_weight = 0
-      packaging.packages.each do |item_package|
-        new_weight = item_package.weight.convert_to(:lb)
-        full_weight += new_weight.value
-      end
-      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)
-      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
-      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, %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
-
-    # creating a ShippingOption
-    def create_shipping_options(rate, rate_label = nil, description = nil, sub_name)
-      ShippingOption.new(
-          carrier: rate.carrier,
-          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,
-            rate.service_name
-          )
-        )
-    end
   end
 end

data/app/models/workarea/shipping.decorator

@@ -7,9 +7,18 @@ module Workarea
     class_methods do
     end
 
-    def find_method_options(packages, shipping_option)
+    def order
+      @order
+    end
+
+    def shipping
+      @shipping
+    end
+
+
+    def default_options(packages)
       return [] if address.blank? || packages.blank?
-      shipping_option = shipping_option || Workarea.config.gateways.shipping
+      shipping_option = Workarea.config.gateways.shipping
 
       origin = ActiveShipping::Location.new(Workarea.config.shipping_origin)
       response = shipping_option.find_rates(
@@ -17,11 +26,238 @@ module Workarea
         address.to_active_shipping,
         packages
       )
-
       response.rates.sort_by(&:price).map do |rate|
         ShippingOption.from_rate_estimate(rate)
       end
+    end
+
+    def find_method_options(order, shipping)
+      @order ||= order
+      @shipping ||= shipping
+      carrier_data = []
+
+      packaging = Packaging.new(order, shipping)
+      return [] if packaging.packages.blank?
+
+      return default_options(packaging.packages) if Workarea.config.gateways.ups_carrier.class == ActiveShipping::Workarea
+
+      shipping_options_api = get_final_shipping_options(collect_carrier_data)
+      return [] if @error.present?
+
+      carrier_data.push(shipping_options_api) if shipping_options_api.present? && shipping_options_api.any?
+
+      if Workarea.config.gateways.ups_carrier.class != ActiveShipping::Workarea
+        carrier_data.push(get_ltl_shipping)
+        carrier_data.push(get_free_shipping) if Workarea.config.show_free_shipping
+      else
+        return []
+      end
+
+      carrier_data.flatten.reverse
+    end
+
+    def get_final_shipping_options(rates)
+      options = []
+      
+      if is_ground
+        ground_rate = rates.detect{|rate| rate.service_code == "GROUND_HOME_DELIVERY" || rate.service_code == "03" }
+        return [] if ground_rate.blank?
+
+        description = "#{ground_rate.delivery_date.strftime('%A, %B %d, %Y')}"
+        days_to_deliver = (ground_rate.delivery_date - Date.today).to_i
+
+        label = Workarea.config.shipping_rates[(days_to_deliver - 1)]
+        return options.push(create_shipping_options(ground_rate, label, description))
+      end
+
+      rates.each_with_index do |rate, index|
+        description = "#{rate.delivery_date.strftime('%A, %B %d, %Y')}"
+        label = Workarea.config.shipping_rates[index]
+        options.push(create_shipping_options(rate, label, description))
+      end
+      options
+    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
+      return get_ups_data
+      # Temporarily disabling fedex and cheaper
+      # return get_fedex_data if is_fedex
+      # return get_none_data unless is_ups && is_fedex
+    end
+
+    # UPS data.
+    def get_ups_data
+      @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.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
+      return [] if get_ups_data.blank? || get_fedex_data.blank?
+      final_options = []
+      temp_options = get_fedex_data + get_ups_data
+      return [] unless temp_options.any?
+
+      delivery_dates = temp_options.map(&:delivery_date).uniq.sort
+      delivery_dates.each_with_index do |date, index|
+        selected_rates = temp_options.select {|rate| rate.delivery_date == date}
+        final_options.push(selected_rates.sort_by(&:price).first)
+      end
+      return final_options
+      
+    end
+
+    # Free shipping option.
+    def get_free_shipping
+    	ShippingOption.new(
+        carrier: "Free Shipping",
+        name: "Valken Economy",
+        sub_name: "5 - 9 Business Days",
+        service_code: "Free",
+        price: Money.new(0.0, "USD"),
+        tax_code: "TAX01"
+      )
+    end
+
+    # Calculating the ltl shipping rates based on the conditions.
+    def get_ltl_shipping
+      weight_price = 0
+      case weight_convertion
+      when 0..2
+        weight_price = 5
+      when 2..15
+        weight_price = 15
+      when 15..200
+        weight_price = (1 * weight_convertion)
+      when 200..2500
+        weight_price = 200
+      else
+        weight_price = ((weight_convertion / 2500).ceil()) * 200
+      end
+
+      ShippingOption.new(
+        carrier: "LTL Shipping",
+        name: "Valken Standard",
+        sub_name: "3 - 5 Business Days",
+        service_code: "LTL01",
+        price: Money.new(weight_price * 100, "USD"),
+        tax_code: "TAX01"
+      )
+    end
+
+    # Returns the total weight.
+    def weight_convertion
+      packaging = Packaging.new(order, shipping)
+      return 0 if packaging.packages.blank?
+      full_weight = 0
+      packaging.packages.each do |item_package|
+        new_weight = item_package.weight.convert_to(:lb)
+        full_weight += new_weight.value
+      end
+      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)
+      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
+      rescue ActiveShipping::ResponseError => e
+        @error = 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 }
+      # sorting the uniq delivery dates and reversing those delivery dates.
+      uniq_delivery_dates = all_delivery_dates.compact.sort.uniq[0..2]
+      
+      # removing overnight. Assuming the 3rd option is always overnight
+      uniq_delivery_dates.pop if uniq_delivery_dates.length == 3
+
+      # 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')}"
+
+        filtered_rates.push(cheap_rate)
+      end
+      filtered_rates
+    end
+
+    # creating a ShippingOption
+    def create_shipping_options(rate, rate_label = nil, description = nil)
+      ShippingOption.new(
+          carrier: rate.carrier,
+          name: rate_label.keys.join || rate.service_name,
+          sub_name: rate_label.values.join,
+          service_code: rate.service_code,
+          description: description,
+          delivery_date: rate.delivery_date,
+          price: Money.new(rate.price, rate.currency),
+          tax_code: Shipping::Service.find_tax_code(
+            rate.carrier,
+            rate.service_name
+          )
+        )
+    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 is_fedex
+      carrier_type_attribute = Workarea.config.shipping_attributes[:carrier_type]
+      product_carrier_type = product_details.map{ |item| item[:en][carrier_type_attribute] }.flatten
+      product_carrier_type.include?("FEDEX")
+    end
+
+    def is_ups
+      carrier_type_attribute = Workarea.config.shipping_attributes[:carrier_type]
+      product_carrier_type = product_details.map{ |item| item[:en][carrier_type_attribute] }.flatten
+      product_carrier_type.include?("UPS")
+    end
+
+    def is_ground
+      ground_ship_attribute = Workarea.config.shipping_attributes[:ground_shipping_only]
+      product_carrier_type = product_details.map{ |item| item[:en][ground_ship_attribute] }.flatten
+      product_carrier_type.include?("true")
+    end
+  
+    def product_details
+      # product_attributes   = @order.items.map(&:product_attributes)
 
+      @product_details ||= Catalog::Product.in(id: @order.items.to_a.map(&:product_id)).pluck(:details)
     end
   end
 end

data/app/models/workarea/shipping_option.decorator

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

data/config/initializers/shipping_configuration.rb

@@ -0,0 +1,12 @@
+Workarea::Configuration.define_fields do
+  fieldset 'Shipping', namespaced: false do
+    field 'Shipping Attributes',
+      type: :hash,
+      default: {
+        'usa_only' => 'usa only',
+        'carrier_type' => 'Type',
+        'ground_shipping_only' => 'ground shipping only'
+      },
+      description: 'Mapping of product details keys with shipping logic. Note: This maps only the keys not the values.'
+  end
+end

data/config/initializers/workarea.rb

@@ -1,4 +1,7 @@
 Workarea.configure do |config|
+
+	config.countries = [Country['US']]
+
   ActiveShipping::Carriers.register :UPS,    'active_shipping/carriers/ups'
 
   config.weight_table = {"2": 5, "15": 15, "200": 1, "2500": 200}

data/lib/valken/shipping/version.rb

@@ -1,5 +1,5 @@
 module Valken
   module Shipping
-    VERSION = '2.0.0'
+    VERSION = '2.0.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valken-shipping
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.6
 platform: ruby
 authors:
 - sushmitha02
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-31 00:00:00.000000000 Z
+date: 2020-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -41,10 +41,12 @@ files:
 - README.md
 - Rakefile
 - app/assets/config/valken_shipping_manifest.js
+- app/helpers/workarea/addresses_helper.rb
 - 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/shipping_configuration.rb
 - config/initializers/workarea.rb
 - config/routes.rb
 - lib/tasks/valken/shipping_tasks.rake