valken-shipping 3.0.1.pre → 3.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a1513e4c5c0a38b69af9f422bb6312fe996faa0928dd089d42c7288a31887a28
-  data.tar.gz: 1af97c1da52c7408dfbe7289a4d5754f5fb41ad4c2ead8ddc76049812f26a6ee
+  metadata.gz: 1021e3db5c695f3db19a503c7c3ae2d5150453bb846269e90fc0fea251b3c387
+  data.tar.gz: 62c48f445c8356b7d0df07952c9ae6dd2e972765c6ad510d884ca7ffa8a7e98b
 SHA512:
-  metadata.gz: 5d8150fc9f6cf02f0046882a65d5bdd07a5f375245834ae6474493bcfee8611f10dfff7e9a438cccc17860e897171b2046120f09aa4a97b4c337678438f5bbe7
-  data.tar.gz: 83c7a5f7e96bc89543c3a73552f2d20841b78e76d380f65f0d72e1b4cf963b20bfbb1b39d1a7149418506f67e0df5bc1ed712add24ba5ca4224cef47c88d327a
+  metadata.gz: 33f2ec06ff31e0e94e73ec37b1845d80ac6eb735a94b89bcfcd9d045e41cf37555564991e177109b700db78715bc8e6f3702af5310ec163cb4d124dfabeb3087
+  data.tar.gz: 7ef270f33827a9c055ebb7513477ecd7bf3e1607a603a7cf29b83404b822cd2aba13f8482afdc4d6be7156d912b06510cbf70c4b806733e33a6a992cb34d75b7

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

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

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

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

data/lib/active_shipping/carriers/valken.rb

@@ -4,7 +4,9 @@ module ActiveShipping
   class VALKEN < UPS
 
     def find_rates(origin, destination, packages, options = {})
-      return get_workarea_rates(origin, destination, packages, options) if options[:ground]
+      if options[:ground] || (::Workarea.config.default_shipping)
+        return get_workarea_services(origin, destination, packages, options)
+      end
       super
     end
 

data/lib/valken/shipping/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: valken-shipping
 version: !ruby/object:Gem::Version
-  version: 3.0.1.pre
+  version: 3.0.1
 platform: ruby
 authors:
 - sushmitha02
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-03 00:00:00.000000000 Z
+date: 2020-12-04 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: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: