workarea-storefront 3.4.33 → 3.4.38

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: dcac4ee32d4ddd3db748a2c27c1fda6044368abd8e942070aa72c26d6a4918ca
4
- data.tar.gz: d35441229e30d7b901c43b61ea4029614311a23690da09df9d88f9c68db81903
3
+ metadata.gz: 6e284524e75f52377887f52caa0469b6374ce6998233d8d94759a9aad191aa9d
4
+ data.tar.gz: 58adbfdf48c610cafdd347897a44d60d9f5f3f7d85fa2d415ab16c1bd8a6179e
5
5
  SHA512:
6
- metadata.gz: 07e9ed88b98017f3cb99692d9c42ff6ad459fec2f76dcefebeb6849d438da6a0f4b386fbbfd563ad997ad39d1401b2eb023b757c286841e31bc330d1b2615192
7
- data.tar.gz: fe288ccc2b2d9a5aad433380cdd777eb7c92fbaae6a310aa8c3ac4fd69659609843f2d2baeea2375cda947b677b287f748b3e04e9e7d2d9948302eefb232f7ab
6
+ metadata.gz: ded977fef1dec5652e15fdfda0cad96e2e9fadf9bb0f45edd5df7055ab8174c15b693caab69bdfda5c87e63d01168709400259b21300857de0021851ed9937ad
7
+ data.tar.gz: b39b33c81ec79773f4cff8d3226c09d8e60d2f7e8da8b8c01cb8b3b71ccb67b509bef92a3e100e432f3609422a3cbfe4a767be6343be4863677e22663d37077e
@@ -46,6 +46,8 @@ module Workarea
46
46
  end
47
47
 
48
48
  def validate_shipping_options
49
+ return unless current_order.requires_shipping?
50
+
49
51
  available_options = Workarea::Storefront::CartViewModel.new(current_order).shipping_options
50
52
 
51
53
  if available_options.empty?
@@ -61,11 +61,8 @@ module Workarea
61
61
  params[:credit_card].permit(
62
62
  :first_name,
63
63
  :last_name,
64
- :number,
65
- :month,
66
- :year,
67
- :cvv,
68
- :default
64
+ :default,
65
+ *Workarea.config.credit_card_attributes
69
66
  )
70
67
  end
71
68
 
@@ -9,7 +9,13 @@ module Workarea
9
9
  end
10
10
 
11
11
  def subjects
12
- Workarea.config.inquiry_subjects.map { |k, v| [v, k] }
12
+ Workarea.config.inquiry_subjects.map do |key, default_value|
13
+ [
14
+ I18n.t('workarea.inquiry.subjects')[key.optionize.to_sym].presence ||
15
+ default_value,
16
+ key
17
+ ]
18
+ end
13
19
  end
14
20
 
15
21
  private
@@ -262,6 +262,32 @@ module Workarea
262
262
 
263
263
  assert(flash[:error].present?)
264
264
  end
265
+
266
+ def test_no_required_shipping_address_options_flash_message
267
+ product = create_product(digital: true)
268
+
269
+ post storefront.cart_items_path,
270
+ params: { product_id: product.id, sku: product.skus.first, quantity: 1 }
271
+
272
+ get storefront.checkout_addresses_path
273
+
274
+ patch storefront.checkout_addresses_path,
275
+ params: {
276
+ email: 'bcrouse@weblinc.com',
277
+ billing_address: {
278
+ first_name: 'Ben',
279
+ last_name: 'Crouse',
280
+ street: '12 N. 3rd St.',
281
+ city: 'Philadelphia',
282
+ region: 'PA',
283
+ postal_code: '19106',
284
+ country: 'US',
285
+ phone_number: '2159251800'
286
+ }
287
+ }
288
+
289
+ refute(flash[:error].present?)
290
+ end
265
291
  end
266
292
  end
267
293
  end
@@ -3,7 +3,9 @@ require 'test_helper'
3
3
  module Workarea
4
4
  module Storefront
5
5
  class PlaceOrderIntegrationTest < Workarea::IntegrationTest
6
- setup do
6
+ setup :setup_checkout
7
+
8
+ def setup_checkout
7
9
  create_tax_category(
8
10
  name: 'Sales Tax',
9
11
  code: '001',
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: workarea-storefront
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.4.33
4
+ version: 3.4.38
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ben Crouse
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2020-05-26 00:00:00.000000000 Z
11
+ date: 2020-08-19 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: workarea-core
@@ -16,14 +16,14 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 3.4.33
19
+ version: 3.4.38
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
24
  - - '='
25
25
  - !ruby/object:Gem::Version
26
- version: 3.4.33
26
+ version: 3.4.38
27
27
  description: Provides user-facing ecommerce storefront functionality for the Workarea
28
28
  Commerce Platform.
29
29
  email: