workarea-storefront 3.5.12 → 3.5.17

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: 5927c378602c40ee9b4597baf1afa11d4bc0af1168eceac4ae32135864c09e1c
4
- data.tar.gz: aad145d930b02c1b4ac12d1032d58591327f236f37c9ac0cf3a5a9dd825cc08c
3
+ metadata.gz: 64a074d921f25dbc672405c7d30bc81c07f931348a1aad856f01a7e666872b8d
4
+ data.tar.gz: a1e60284eda37d8ca103056d4df1b0ce304d0b318d6dea254d4938b8aeef9898
5
5
  SHA512:
6
- metadata.gz: 70ad91e1b06aceb9dba188fd711068a6cba35f9709c162e08b0fba876c953bfe8550441ada2f8753282536744918af55d0c8a09ecc0c31800cdff3e9793f3444
7
- data.tar.gz: 3b4d4ccb95b1f7898b4f07873c5c54b191a6903cbe1459a898d134c02646b345c93993f6bcdb69aab99f0a60faa452fce363eb5cb2e3cf073e81db8ab4a790fb
6
+ metadata.gz: 6a6a527392e576fa45a89d02ecaf3ef0aff8b20245b27c4c5728f1c6c6c9e6d23dfe9a126aa179f278d4b997567052eef6c9e36288f4aa075d4ea26f1eb1941e
7
+ data.tar.gz: 4b7e348fd868c930a55410aca15c0432a4f5a9c34bc1ffe3d110e94212e5b81b788f0ae8eb376d9eef9c9d114f58e7d001cc0693819a5af129e86e1f32566640
@@ -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
@@ -164,8 +164,6 @@
164
164
  %tr
165
165
  %td= link_to t('workarea.storefront.orders.download'), download_url(item.token)
166
166
 
167
- = append_partials('storefront.order_summary_item_details', item: item)
168
-
169
167
  = append_partials('storefront.order_mailer_summary_order_details', item: item)
170
168
 
171
169
  - if item.total_adjustments.many?
@@ -351,6 +351,33 @@ module Workarea
351
351
  get storefront.checkout_shipping_path
352
352
  assert_equal('foo@bar.com', cookies[:email])
353
353
  end
354
+
355
+ def test_no_required_shipping_address_options_flash_message
356
+ product = create_product(name: 'Digital Product', variants: [{ sku: 'SKU' }])
357
+ create_fulfillment_sku(id: 'SKU', policy: :download, file: product_image_file)
358
+
359
+ post storefront.cart_items_path,
360
+ params: { product_id: product.id, sku: product.skus.first, quantity: 1 }
361
+
362
+ get storefront.checkout_addresses_path
363
+
364
+ patch storefront.checkout_addresses_path,
365
+ params: {
366
+ email: 'bcrouse@weblinc.com',
367
+ billing_address: {
368
+ first_name: 'Ben',
369
+ last_name: 'Crouse',
370
+ street: '12 N. 3rd St.',
371
+ city: 'Philadelphia',
372
+ region: 'PA',
373
+ postal_code: '19106',
374
+ country: 'US',
375
+ phone_number: '2159251800'
376
+ }
377
+ }
378
+
379
+ refute(flash[:error].present?)
380
+ end
354
381
  end
355
382
  end
356
383
  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.5.12
4
+ version: 3.5.17
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.5.12
19
+ version: 3.5.17
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.5.12
26
+ version: 3.5.17
27
27
  description: Provides user-facing ecommerce storefront functionality for the Workarea
28
28
  Commerce Platform.
29
29
  email: