valken-shipping 1.1.9 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c1b1ed71fdb852fdbd8b1ca1018fb950435b4860fe86fb6a06b6cff3b76da06d
4
- data.tar.gz: 24da7f5bd45aee0254d206c949f7cac835fa74ee2e98d18135eb5cd046bc7c0f
3
+ metadata.gz: ab3690dda426e4cf2d007e9c44872957323960c8457434bef1134c1f373194f4
4
+ data.tar.gz: 38f098df1c9aa7a8a83bbbb8fd52a34984aa0329fc8e248dc9337f5aeacb3d05
5
5
  SHA512:
6
- metadata.gz: fabbba71a4d896abddc6b05797d8cd8fbbaa5eb9a2fa3a2066a0e4f93b0559c5d097a99d3f3bece098b4a229adf5615acff7f5dc84a652bfe2cec62430e52515
7
- data.tar.gz: 4173b8f446c15d72b96f4df7856739a2b1b6fdd20b647e0855de69de5906448bd00050cea9a8d9f315961d5bb042cbe71b43a25408b56ced44406350179e3af3
6
+ metadata.gz: c629f3bc576ff4f7019966324569b77424d5d09e4af73928f5587c025fb1c2152d3224ca284d004b182b57ebaa736327d1ceb4683a022ed6299f8f3305a10ce1
7
+ data.tar.gz: eea6eb560252fef7fdd359b4ae4d59a277a7694c6dfa6c79708b5141d9f29ed1d4663e0782d8b5e02c075432b4f3a5b824bc4a0a8849bf92a4fb32f9b84ea1a1
@@ -12,13 +12,12 @@ module Workarea
12
12
  end
13
13
 
14
14
  def shipping_option
15
- carrier_data = []
15
+ carrier_data = collect_carrier_data(selected_carrier)
16
16
  if Workarea.config.gateways.ups_carrier.class != ActiveShipping::Workarea
17
- carrier_data.push(get_free_shipping) if Workarea.config.show_free_shipping
18
17
  carrier_data.push(get_ltl_shipping)
18
+ carrier_data.push(get_free_shipping) if Workarea.config.show_free_shipping
19
19
  end
20
- carrier_data.push(collect_carrier_data(selected_carrier))
21
- carrier_data.flatten
20
+ carrier_data
22
21
  end
23
22
 
24
23
  # Selecting the shipping carrier based on order items
@@ -161,12 +160,8 @@ module Workarea
161
160
 
162
161
  # find and sort all delivery dates and pick 1st three
163
162
  all_delivery_dates = rates.map { |rate| rate.delivery_date }
164
- # sorting the uniq delivery dates and reversing those delivery dates.
165
- uniq_delivery_dates = all_delivery_dates.compact.sort.uniq[0..2].reverse
163
+ uniq_delivery_dates = all_delivery_dates.compact.sort.uniq[0..2]
166
164
 
167
- # removing overnight. Assuming the 3rd option is always overnight
168
- uniq_delivery_dates.pop if uniq_delivery_dates.length == 3
169
-
170
165
  # For each delivery dates, find cheapest rates and create shipping option and push
171
166
  uniq_delivery_dates.each_with_index do |date, index|
172
167
  selected_rates = rates.select {|rate| rate.delivery_date.present? && rate.delivery_date == date}
@@ -1,6 +1,7 @@
1
1
  module Workarea
2
2
  decorate Shipping, with: :valken do
3
- decorated do
3
+ decorated do
4
+ field :tracking_number, type: String
4
5
  end
5
6
 
6
7
  class_methods do
@@ -9,7 +10,7 @@ module Workarea
9
10
  def find_method_options(packages, shipping_option)
10
11
  return [] if address.blank? || packages.blank?
11
12
  shipping_option = shipping_option || Workarea.config.gateways.shipping
12
-
13
+
13
14
  origin = ActiveShipping::Location.new(Workarea.config.shipping_origin)
14
15
  response = shipping_option.find_rates(
15
16
  origin,
@@ -4,8 +4,9 @@ Workarea.configure do |config|
4
4
  config.weight_table = {"2": 5, "15": 15, "200": 1, "2500": 200}
5
5
 
6
6
  config.shipping_rates = [
7
- {"Valken Express 3-Day" => "3 Business Days"},
8
- {"Valken Express 2-Day" => "2 Business Days"}
7
+ {"Valken Overnight" => "Overnight"},
8
+ {"Valken Express 2-Day" => "2 Business Days"},
9
+ {"Valken Express 3-Day" => "3 Business Days"}
9
10
  ]
10
11
  config.ups_options = {"12"=> "Valken Express 3-Day", "01"=> "Valken Overnight", "02"=> "Valken Express 2-Day"}
11
12
  config.fedex_options = {"STANDARD_OVERNIGHT"=> "Valken Overnight", "FEDEX_2_DAY"=> "Valken Express 2-Day", "GROUND_HOME_DELIVERY"=> "Valken Express 3-Day"}
@@ -1,5 +1,5 @@
1
1
  module Valken
2
2
  module Shipping
3
- VERSION = '1.1.9'
3
+ VERSION = '2.0.0'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: valken-shipping
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.9
4
+ version: 2.0.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - sushmitha02
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-08-30 00:00:00.000000000 Z
11
+ date: 2020-08-31 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
70
70
  - !ruby/object:Gem::Version
71
71
  version: '0'
72
72
  requirements: []
73
- rubygems_version: 3.0.6
73
+ rubygems_version: 3.0.8
74
74
  signing_key:
75
75
  specification_version: 4
76
76
  summary: shipping options