valken-shipping 3.0.2 → 3.0.3.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d75de69e6cf65115669bdcd1a2c662ec266b3aed8d7cc769e72e9bac336baa7e
-  data.tar.gz: c43b08dc302d9a98931e5173ff18af67b7403cc53004fd0a6d7bea5cbb1d8d17
+  metadata.gz: bcfa8404b116337a84e98d859e0490b2c306ca286337be2fd64436add9ca7323
+  data.tar.gz: 24a83e8fa9abfd9e9c5e57e37db4beaf4f4abab4a45c1b1bbbca23b5bae56ebc
 SHA512:
-  metadata.gz: de828f51c73f612bf7939e277e1eaa495ca86f9287ba1f17562a0b74b6d88970cb57306ccb8143fd9dc86ff27d6a21d8cfb1660281ee190f3cd3f19ba31d4fed
-  data.tar.gz: c6edd088265f12e9dd6d599dd3c7a4350a12cff1b586c082113ac12695bfd2866e2ee1931a7ec8a3c0461c89324c01ef338d127f76e4c4120fd8e5b6aa366601
+  metadata.gz: 95791f77bb3756a6ab9fc00e15dc18723da1953133db0092738f55f36e630b2ccb465d38c248939775158a1e14c04dfec726d7716e82b0611cab1351041dbd0c
+  data.tar.gz: 1a0aa5af87a183054ec21a491e3ed03d6e69990ac62934b5f00c84aeb47b8a8984c49b7499e5639cf7efd55d4eac67e0af177cded9222a0b20b10daccb3b9782

data/app/models/workarea/shipping.decorator

@@ -47,16 +47,31 @@ module Workarea
         packaging.packages,
         {
           ground: is_ground,
-          special_region: is_special_region?
+          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
 
+      shipping_options.unshift(get_free_shipping) if is_free_ship
       shipping_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, Money.default_currency.to_s),
+        tax_code: "TAX01"
+      )
+    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
@@ -67,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/views/workarea/admin/shipping_services/edit.html.haml

@@ -61,14 +61,13 @@
                 %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, false, id: nil
-
+                %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_max]', '', placeholder: 'Min Value', class: 'text-box'
+              %td= text_field_tag 'new_rates[][tier_min]', '', placeholder: 'Min Value', class: 'text-box'
               %td
 
       .workflow-bar

data/lib/active_shipping/carriers/valken.rb

@@ -4,9 +4,7 @@ module ActiveShipping
   class VALKEN < UPS
 
     def find_rates(origin, destination, packages, options = {})
-      if options[:ground] || (::Workarea.config.default_shipping)
-        return get_workarea_services(origin, destination, packages, options)
-      end
+      return get_workarea_rates(origin, destination, packages, options) if options[:ground]
       super
     end
 
@@ -36,8 +34,7 @@ module ActiveShipping
       end
 
       workarea_rates = get_workarea_services(origin, destination, packages, options).rates
-
-      if message.include?("Failure: Maximum number of packages exceeded")
+      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)

data/lib/valken/shipping/version.rb

@@ -1,5 +1,5 @@
 module Valken
   module Shipping
-    VERSION = '3.0.2'.freeze
+    VERSION = '3.0.3.pre'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valken-shipping
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3.pre
 platform: ruby
 authors:
 - sushmitha02
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-15 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -76,9 +76,9 @@ 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.3
 signing_key: