valken-shipping 2.0.9 → 3.0.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc10c599481dc98cee8685adb0b8b321b27e49461965605af4f5b326fdbe73d5
-  data.tar.gz: 8841aaf757d728ca2eb93845fb8e38bf95f9a5e7fbf8c848850997fce824fb4e
+  metadata.gz: a1513e4c5c0a38b69af9f422bb6312fe996faa0928dd089d42c7288a31887a28
+  data.tar.gz: 1af97c1da52c7408dfbe7289a4d5754f5fb41ad4c2ead8ddc76049812f26a6ee
 SHA512:
-  metadata.gz: 601e1c833f65e3dc73746c42ec82794c132bb15af5bcdf9ec78dd5dae7e3004d102625943202f127fa19b6a35d94626d6c5f95d272396bd1fe28db488b59cb4c
-  data.tar.gz: 6796e2e1c7c0a16d6097908c0b1619cd76c055af403d4adbc356033bc5f84b577aeb289792a1f11aa8b4a537f5bed925cbd88ade4fe997be306fb441e326fdd4
+  metadata.gz: 5d8150fc9f6cf02f0046882a65d5bdd07a5f375245834ae6474493bcfee8611f10dfff7e9a438cccc17860e897171b2046120f09aa4a97b4c337678438f5bbe7
+  data.tar.gz: 83c7a5f7e96bc89543c3a73552f2d20841b78e76d380f65f0d72e1b4cf963b20bfbb1b39d1a7149418506f67e0df5bc1ed712add24ba5ca4224cef47c88d327a

data/app/models/workarea/shipping.decorator

@@ -37,85 +37,28 @@ module Workarea
       carrier_data = []
 
       packaging = Packaging.new(order, shipping)
-      return [] if packaging.packages.blank?
+      return [] if packaging.packages.blank? || address.blank?
 
-      return default_options(packaging.packages) if Workarea.config.gateways.ups_carrier.class == ActiveShipping::Workarea
-
-      if is_special_region?
-          return [get_shipping_for_special_region]
-      end
-
-      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))
+      shipping_option = Workarea.config.gateways.shipping
+      origin = ActiveShipping::Location.new(Workarea.config.shipping_origin)
+      response = shipping_option.find_rates(
+        origin,
+        address.to_active_shipping,
+        packaging.packages,
+        {
+          ground: is_ground,
+          special_region: is_special_region?,
+          free_shipping: is_free_ship
+        }
+      )
+      shipping_options = response.rates.sort_by(&:price).map do |rate|
+        ShippingOption.from_rate_estimate(rate)
       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
+      shipping_options.unshift(get_free_shipping) if is_free_ship
+      shipping_options
     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
@@ -124,158 +67,11 @@ module Workarea
         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"),
+        price: Money.new(0.0, Money.default_currency.to_s),
         tax_code: "TAX01"
       )
     end
 
-    def get_shipping_for_special_region
-      puts "weight_convertion",weight_convertion
-      weight_price = 0
-      case weight_convertion
-      when 0..15
-        weight_price = 50
-      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
@@ -286,6 +82,27 @@ module Workarea
       Workarea.config.special_region.include?(@shipping.address.region)
     end
 
+    #  if any of the product is NO FREE SHIPPING = TRUE then return false
+    #  if free shipping config is then return true
+    #  if user applies free shipping promo code then return true
+    def is_free_ship
+      free_ship_attribute = Workarea.config.shipping_attributes[:no_free_shipping]
+      product_carrier_type = product_details.map{ |item| item[:en][free_ship_attribute] }.flatten
+      return false if product_carrier_type.include?("true")
+
+      return true if Workarea.config.show_free_shipping
+
+      test_order = order.clone
+      test_shipping = shipping.clone
+      test_shipping.apply_shipping_service(get_free_shipping.to_h)
+
+      price_adjustments = Pricing.find_shipping_discounts(
+        test_order,
+        test_shipping
+      )
+      return price_adjustments.present? && price_adjustments.any?
+    end
+
     def product_details
       # product_attributes   = @order.items.map(&:product_attributes)
 

data/app/models/workarea/shipping/rate.decorator

@@ -0,0 +1,12 @@
+module Workarea
+  decorate Shipping::Rate, with: :valken_shipping do
+    decorated do
+      field :tier_weight_min, type: Float
+      field :tier_weight_max, type: Float
+    end
+
+    def weight_tiered?
+      !tier_weight_min.nil? || !tier_weight_max.nil?
+    end
+  end
+end

data/app/models/workarea/shipping/rate_lookup.decorator

@@ -0,0 +1,36 @@
+module Workarea
+  decorate Shipping::RateLookup, with: :valken_shipping do
+
+    def total_weight
+      full_weight = 0
+      packages.each do |item_package|
+        new_weight = item_package.weight.convert_to(:lb)
+        full_weight += new_weight.value
+      end
+      full_weight
+    end
+
+    def response
+      ActiveShipping::RateResponse.new(
+        true, # success
+        'success', # message
+        {}, # params
+        rates: valid_services.map do |service|
+          total = service.find_rate(subtotal, total_weight).try(:price)
+          next unless total.present?
+
+          ActiveShipping::RateEstimate.new(
+            origin,
+            destination,
+            service.carrier,
+            service.name,
+            description: service.description,
+            service_code: service.service_code,
+            total_price: total.cents,
+            currency: total.currency.to_s
+          )
+        end.compact
+      )
+    end
+  end
+end

data/app/models/workarea/shipping/service.decorator

@@ -0,0 +1,50 @@
+module Workarea
+  decorate Shipping::Service, with: :valken_shipping do
+    decorated do
+      field :description, type: String
+    end
+
+    def find_rate(price = 0.to_m, weight = 0)
+      if tiered? && weight_tiered?
+        rates.detect do |rate|
+          (rate.tier_min.nil? || rate.tier_min <= price) &&
+            (rate.tier_max.nil? || rate.tier_max >= price) && 
+              (rate.tier_weight_min.nil? || rate.tier_weight_min <= weight) &&
+                (rate.tier_weight_max.nil? || rate.tier_weight_max >= weight)
+        end
+      elsif weight_tiered?
+        rates.detect do |rate|
+          (rate.tier_weight_min.nil? || rate.tier_weight_min <= weight) &&
+            (rate.tier_weight_max.nil? || rate.tier_weight_max >= weight)
+        end
+      elsif tiered?
+        rates.detect do |rate|
+          (rate.tier_min.nil? || rate.tier_min <= price) &&
+            (rate.tier_max.nil? || rate.tier_max >= price)
+        end
+      else
+        rates.first
+      end
+    end
+
+    def tiered?
+      rates.any?(&:tiered?)
+    end
+
+    def weight_tiered?
+      rates.any?(&:weight_tiered?)
+    end
+
+    private
+      def rate_tiering
+        non_tiered_rates = rates.reject(&:tiered?).reject(&:weight_tiered?)
+
+        if non_tiered_rates.length > 1
+          errors.add(
+            :rates,
+            I18n.t('workarea.errors.messages.exceeds_non_tiered_rate_limit')
+          )
+        end
+      end
+  end
+end

data/app/models/workarea/shipping_option.decorator

@@ -5,6 +5,21 @@ module Workarea
     end
 
     class_methods do
+      def from_rate_estimate(rate)
+        new(
+          carrier: rate.carrier,
+          name: rate.service_name,
+          service_code: rate.service_code,
+          price: Money.new(rate.price, rate.currency),
+          tax_code: Shipping::Service.find_tax_code(
+            rate.carrier,
+            rate.service_name
+          ),
+          sub_name: rate.description,
+          description: rate.delivery_date&.strftime('%A, %B %d, %Y'),
+          delivery_date: rate.delivery_date
+        )
+      end
     end
   end
 end

data/app/services/workarea/packaging.decorator

@@ -3,6 +3,22 @@ module Workarea
     decorated do
     end
 
+    def packages
+      Array(1..no_of_packs).map do |i|
+        ActiveShipping::Package.new(
+          Measured::Weight.new(total_weight_lb/no_of_packs, :lb),
+          total_dimensions,
+          Workarea.config.shipping_options.merge(value: total_value)
+        )
+      end
+    end
+
+    def no_of_packs
+      packs_count = (total_weight_lb / Workarea.config.max_weight_per_pack).ceil
+
+      return packs_count == 0 ? 1 : packs_count
+    end
+
     def find_shipping_sku(sku)
       shipping_skus.detect { |s| s.id == sku } || Shipping::Sku.new(id: sku, weight: find_sku_weight(sku))
     end
@@ -10,16 +26,20 @@ module Workarea
     def find_sku_weight(sku)
       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 = is_pounds(sku_data) ? convert_to_oz(sku_data.weight || 1) : (sku_data.weight  || 1)
       sku_weight
     end
 
-    def convert_to_lb(weight)
+    def convert_to_oz(weight)
       unit = Measured::Weight.new(weight, :lb)
       ounce_unit = unit.convert_to(:oz)
       ounce_unit.value
     end
 
+    def total_weight_lb
+      @total_weight_lb ||= Measured::Weight.new(total_weight, :oz).convert_to(:lb).value
+    end
+
     def is_pounds(sku_data)
       sku_data.weight_unit == "lb"
     end

data/app/views/workarea/admin/shipping_services/_addtional_service_fields.html.haml

@@ -0,0 +1,6 @@
+.property
+  = label_tag 'service_description', "Carrier Name", class: 'property__name'
+  = text_field_tag "service[carrier]", @service.carrier, class: 'text-box'
+.property
+  = label_tag 'service_description', "Description", class: 'property__name'
+  = text_field_tag "service[description]", @service.description, class: 'text-box'

data/app/views/workarea/admin/shipping_services/edit.html.haml

@@ -0,0 +1,79 @@
+- @page_title = t('workarea.admin.shipping_services.edit.title', service: @service.name)
+
+.view
+  .view__header
+    .grid.grid--middle.grid--center
+      .grid__cell.grid__cell--50
+        .view__heading
+          = link_to_index_for(@service)
+          %h1= @service.name
+
+  .view__container
+    - if @service.errors.present?
+      - @service.errors.full_messages.each do |message|
+        = render_message 'error', message
+
+    = form_tag shipping_service_path(@service), method: :patch, id: 'shipping_service_form', data: { unsaved_changes: '' } do
+
+      .section
+
+        .property.property--required
+          = label_tag 'service_name', t('workarea.admin.fields.name'), class: 'property__name'
+          = text_field_tag 'service[name]', @service.name, class: 'text-box text-box--i18n', required: true
+
+        .property
+          = label_tag 'service_tax_code', t('workarea.admin.fields.tax_code'), class: 'property__name'
+          = text_field_tag 'service[tax_code]', @service.tax_code, class: 'text-box'
+
+        .property
+          = label_tag 'service_service_code', t('workarea.admin.fields.service_code'), class: 'property__name'
+          = text_field_tag 'service[service_code]', @service.service_code, class: 'text-box'
+
+        .property
+          = label_tag 'service_country', t('workarea.admin.fields.country'), class: 'property__name'
+          = select_tag "service[country]", options_for_select(country_options, @service.country.try(:alpha2)), prompt: t('workarea.admin.shipping_services.options.not_specified')
+
+        .property
+          = label_tag 'service_regions', t('workarea.admin.fields.regions'), class: 'property__name'
+          = text_field_tag "service[regions_list]", @service.regions_list, class: 'text-box'
+          %span.property__note= t('workarea.admin.shipping_services.regions_note')
+
+        = append_partials('admin.shipping_service_fields', service: @service)
+
+      .section
+
+        %h2= t('workarea.admin.shipping_services.shipping_rates.title')
+
+        %table
+          %thead
+            %tr
+              %th= t('workarea.admin.shipping_services.shipping_rates.price')
+              %th= "Min Weight (lb)"
+              %th= "Max Weight (lb)"
+              %th= t('workarea.admin.shipping_services.shipping_rates.min_value')
+              %th= t('workarea.admin.shipping_services.shipping_rates.max_value')
+              %th= t('workarea.admin.actions.remove')
+          %tbody
+            - @service.rates.each do |rate|
+              %tr
+                %td=text_field_tag "rates[#{rate.id}][price]", rate.price, class: 'text-box'
+                %td= text_field_tag "rates[#{rate.id}][tier_weight_min]", rate.tier_weight_min, class: 'text-box'
+                %td= text_field_tag "rates[#{rate.id}][tier_weight_max]", rate.tier_weight_max, class: 'text-box'
+                %td= text_field_tag "rates[#{rate.id}][tier_min]", rate.tier_min, class: 'text-box'
+                %td= text_field_tag "rates[#{rate.id}][tier_max]", rate.tier_max, class: 'text-box'
+                %td= check_box_tag 'rates_to_remove[]', rate.id
+            %tr{ data: { cloneable_row: '' } }
+              %td= text_field_tag 'new_rates[][price]', '', placeholder: 'New Price Tier', class: 'text-box'
+              %td= text_field_tag 'new_rates[][tier_weight_min]', '', placeholder: 'Min Weight Value', class: 'text-box'
+              %td= text_field_tag 'new_rates[][tier_weight_max]', '', placeholder: 'Max Weight Value', class: 'text-box'
+              %td= text_field_tag 'new_rates[][tier_min]', '', placeholder: 'Min Value', class: 'text-box'
+              %td= text_field_tag 'new_rates[][tier_min]', '', placeholder: 'Min Value', class: 'text-box'
+              %td
+
+      .workflow-bar
+        .grid
+          .grid__cell.grid__cell--50
+            = link_to t('workarea.admin.actions.delete'), shipping_service_path(@service), class: 'workflow-bar__button workflow-bar__button--delete', data: { method: 'delete', confirm: t('workarea.admin.actions.delete_confirmation') }
+          .grid__cell.grid__cell--50
+            .align-right
+              = button_tag t('workarea.admin.shipping_services.edit.button'), value: 'save_shipping_service', class: 'workflow-bar__button workflow-bar__button--update'

data/app/views/workarea/admin/shipping_services/new.html.haml

@@ -0,0 +1,65 @@
+- @page_title = t('workarea.admin.shipping_services.new.title')
+
+.view
+  .view__header
+    .grid.grid--middle.grid--center
+      .grid__cell.grid__cell--50
+        .view__heading
+          = link_to_index_for(@service)
+          %h1= t('workarea.admin.shipping_services.new.title')
+
+  .view__container
+    - if @service.errors.present?
+      - @service.errors.full_messages.each do |message|
+        = render_message 'error', message
+
+    = form_tag shipping_services_path(@service), method: :post, id: 'shipping_service_form', data: { unsaved_changes: '' } do
+
+      .section
+
+        .property.property--required
+          = label_tag 'service_name', t('workarea.admin.fields.name'), class: 'property__name'
+          = text_field_tag 'service[name]', @service.name, class: 'text-box text-box--i18n', required: true
+
+        .property
+          = label_tag 'service_tax_code', t('workarea.admin.fields.tax_code'), class: 'property__name'
+          = text_field_tag 'service[tax_code]', @service.tax_code, class: 'text-box'
+
+        .property
+          = label_tag 'service_service_code', t('workarea.admin.fields.service_code'), class: 'property__name'
+          = text_field_tag 'service[service_code]', @service.service_code, class: 'text-box'
+
+        .property
+          = label_tag 'service_country', t('workarea.admin.fields.country'), class: 'property__name'
+          = select_tag "service[country]", options_for_select(country_options, @service.country.try(:alpha2)), prompt: t('workarea.admin.shipping_services.options.not_specified')
+
+        .property
+          = label_tag 'service_regions', t('workarea.admin.fields.regions'), class: 'property__name'
+          = text_field_tag "service[regions_list]", @service.regions_list, class: 'text-box'
+          %span.property__note= t('workarea.admin.shipping_services.regions_note')
+
+        = append_partials('admin.shipping_service_fields', service: @service)
+
+      .section
+
+        %h2= t('workarea.admin.shipping_services.shipping_rates.title')
+
+        %table
+          %thead
+            %tr
+              %th= t('workarea.admin.shipping_services.shipping_rates.price')
+              %th= "Min Weight (lb)"
+              %th= "Max Weight (lb)"
+              %th= t('workarea.admin.shipping_services.shipping_rates.min_value')
+              %th= t('workarea.admin.shipping_services.shipping_rates.max_value')
+          %tbody
+            %tr{ data: { cloneable_row: '' } }
+              %td= text_field_tag 'new_rates[][price]', '', placeholder: 'New Price Tier', class: 'text-box', title: 'New Price Tier'
+              %td= text_field_tag 'new_rates[][tier_weight_min]', '', placeholder: 'Min Weight Value', class: 'text-box'
+              %td= text_field_tag 'new_rates[][tier_weight_max]', '', placeholder: 'Max Weight Value', class: 'text-box'
+              %td= text_field_tag 'new_rates[][tier_min]', '', placeholder: 'Min Value', class: 'text-box', title: 'Min Value'
+              %td= text_field_tag 'new_rates[][tier_max]', '', placeholder: 'Max Value', class: 'text-box', title: 'Max Value'
+
+      .workflow-bar
+        .grid.grid--auto.grid--right.grid--middle
+          .grid__cell= button_tag t('workarea.admin.shipping_services.new.create_shipping_service'), value: 'create_shipping_service', class: 'workflow-bar__button workflow-bar__button--create'

data/config/initializers/appends.rb

@@ -0,0 +1,4 @@
+Workarea.append_partials(
+  'admin.shipping_service_fields',
+  'workarea/admin/shipping_services/addtional_service_fields'
+)

data/config/initializers/shipping_configuration.rb

@@ -5,7 +5,8 @@ Workarea::Configuration.define_fields do
       default: {
         'usa_only' => 'usa only',
         'carrier_type' => 'Type',
-        'ground_shipping_only' => 'ground shipping only'
+        'ground_shipping_only' => 'ground shipping only',
+        'no_free_shipping' => 'no free shipping'
       },
       description: 'Mapping of product details keys with shipping logic. Note: This maps only the keys not the values.'
 

data/config/initializers/workarea.rb

@@ -1,17 +1,10 @@
 Workarea.configure do |config|
 
-	config.countries = [Country['US']]
+	config.countries = [Country['US'], Country['CA']]
 
   ActiveShipping::Carriers.register :UPS,    'active_shipping/carriers/ups'
+  ActiveShipping::Carriers.register :VALKEN,    'active_shipping/carriers/valken'
 
-  config.weight_table = {"2": 5, "15": 15, "200": 1, "2500": 200}
-
-  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"}
+  config.max_weight_per_pack = 150
 end
 Valken::Shipping.auto_initialize_gateway

data/lib/active_shipping/carriers/valken.rb

@@ -0,0 +1,90 @@
+require 'active_shipping'
+
+module ActiveShipping
+  class VALKEN < UPS
+
+    def find_rates(origin, destination, packages, options = {})
+      return get_workarea_rates(origin, destination, packages, options) if options[:ground]
+      super
+    end
+
+    def parse_rate_response(origin, destination, packages, response, options = {})
+      xml = build_document(response, 'RatingServiceSelectionResponse')
+      success = response_success?(xml)
+      message = response_message(xml)
+      filtered_rates = []
+      if success
+        rate_estimates = xml.root.css('> RatedShipment').map do |rated_shipment|
+          service_code = rated_shipment.at('Service/Code').text
+          days_to_delivery = rated_shipment.at('GuaranteedDaysToDelivery').text.to_i
+          days_to_delivery = nil if days_to_delivery == 0
+          warning_messages = rate_warning_messages(rated_shipment)
+          RateEstimate.new(origin, destination, @@name, service_name_for(origin, service_code),
+              total_price: rated_shipment.at('TotalCharges/MonetaryValue').text.to_f,
+              insurance_price: rated_shipment.at('ServiceOptionsCharges/MonetaryValue').text.to_f,
+              currency: rated_shipment.at('TotalCharges/CurrencyCode').text,
+              service_code: service_code,
+              packages: packages,
+              delivery_range: [timestamp_from_business_day(days_to_delivery)],
+              negotiated_rate: rated_shipment.at('NegotiatedRates/NetSummaryCharges/GrandTotal/MonetaryValue').try(:text).to_f,
+              messages: warning_messages
+          )
+        end
+        filtered_rates = filter_rates(rate_estimates)
+      end
+
+      workarea_rates = get_workarea_services(origin, destination, packages, options).rates
+      if message == "Failure: Maximum number of packages exceeded (200)"
+        RateResponse.new(true, "Only workarea shipping service", {}, rates: workarea_rates, xml: "", request: "")
+      else
+        RateResponse.new(success, message, Hash.from_xml(response).values.first, rates:(filtered_rates + workarea_rates).flatten, xml: response, request: last_request)
+      end
+    end
+
+    def get_workarea_services(*args)
+      ::Workarea::Shipping::RateLookup.new(*args).response
+    end
+
+    def filter_rates(rates)
+      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]
+
+      # 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
+        filtered_rates.push(cheap_rate)
+      end
+
+      if filtered_rates[-1].present?
+        filtered_rates[-1].service_name = "Valken Express 3-Day"
+        filtered_rates[-1].description = "3 Business Days"
+      end
+
+      if filtered_rates[-2].present?
+        filtered_rates[-2].service_name = "Valken Express 2-Day"
+        filtered_rates[-2].description = "2 Business Days"
+      end
+
+      if filtered_rates[-3].present?
+        filtered_rates[-3].service_name = "Valken Overnight"
+        filtered_rates[-3].description = "Overnight"
+      end
+
+      return filtered_rates
+    end
+
+    def weight_convertion(packages)
+      full_weight = 0
+      packages.each do |item_package|
+        new_weight = item_package.weight.convert_to(:lb)
+        full_weight += new_weight.value
+      end
+      full_weight
+    end
+
+  end
+end

data/lib/valken/shipping.rb

@@ -24,18 +24,15 @@ module Valken
       Workarea.config.gateways.fedex_carrier = gateway
     end
 
-    def self.auto_initialize_gateway
-      if ups_credentials.present? && fedex_credentials.present?
+    def self.auto_initialize_gateway      
+      if ups_credentials.present? && !Workarea.config.default_shipping
         if Rails.env.test?
-          self.ups_gateway = ActiveShipping::Workarea.new
-          self.fedex_gateway = ActiveShipping::Workarea.new
+          Workarea.config.gateways.shipping = ActiveShipping::Workarea.new
         else
-          self.ups_gateway = ActiveShipping::UPS.new ups_credentials
-          self.fedex_gateway = ActiveShipping::FedEx.new fedex_credentials
+          Workarea.config.gateways.shipping = ActiveShipping::VALKEN.new ups_credentials
         end
       else
-        self.ups_gateway = ActiveShipping::Workarea.new
-        self.fedex_gateway = ActiveShipping::Workarea.new
+        Workarea.config.gateways.shipping = ActiveShipping::Workarea.new
       end
     end
   end

data/lib/valken/shipping/version.rb

@@ -1,5 +1,5 @@
 module Valken
   module Shipping
-    VERSION = '2.0.9'
+    VERSION = '3.0.1.pre'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valken-shipping
 version: !ruby/object:Gem::Version
-  version: 2.0.9
+  version: 3.0.1.pre
 platform: ruby
 authors:
 - sushmitha02
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-05 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -44,11 +44,19 @@ files:
 - app/helpers/workarea/addresses_helper.rb
 - app/models/workarea/checkout/shipping_options.decorator
 - app/models/workarea/shipping.decorator
+- app/models/workarea/shipping/rate.decorator
+- app/models/workarea/shipping/rate_lookup.decorator
+- app/models/workarea/shipping/service.decorator
 - app/models/workarea/shipping_option.decorator
 - app/services/workarea/packaging.decorator
+- app/views/workarea/admin/shipping_services/_addtional_service_fields.html.haml
+- app/views/workarea/admin/shipping_services/edit.html.haml
+- app/views/workarea/admin/shipping_services/new.html.haml
+- config/initializers/appends.rb
 - config/initializers/shipping_configuration.rb
 - config/initializers/workarea.rb
 - config/routes.rb
+- lib/active_shipping/carriers/valken.rb
 - lib/tasks/valken/shipping_tasks.rake
 - lib/valken/shipping.rb
 - lib/valken/shipping/engine.rb
@@ -57,7 +65,7 @@ homepage: https://github.com/sushmitha02
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -68,12 +76,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: shipping options
 test_files: []