workarea-admin 3.4.34 → 3.4.35

Sign up to get free protection for your applications and to get access to all the features.
Files changed (7) hide show
  1. checksums.yaml +4 -4
  2. data/app/view_models/workarea/admin/code_list_view_model.rb +1 -1
  3. data/app/views/workarea/admin/facets/_applied.html.haml +1 -1
  4. data/app/views/workarea/admin/pricing_discount_code_lists/_cards.html.haml +1 -1
  5. data/app/views/workarea/admin/pricing_discount_code_lists/promo_codes.html.haml +1 -1
  6. data/test/view_models/workarea/admin/code_list_view_model_test.rb +5 -0
  7. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e5230f58914602ef18cf228a8b7cd3f02e2b1dd9c3d172b14714c7ce7c58f624
4
- data.tar.gz: cc2a6bf7861708d6e12803b4008633192700c28cb50005b376cc59153aac3fab
3
+ metadata.gz: ed11773874c838f85f62a2f15513b10f77eaee7662388c377037b43d22d64887
4
+ data.tar.gz: 93e38cccb74c77a6cf470c16295da7c49e5fe08eec53ba281ffb510c3c79af27
5
5
  SHA512:
6
- metadata.gz: 2bb2e8897d7291d59a3cfd4f35eeb896cd93762ca61a4f79a14d299a280391abc0a2c41e26c0397c0e02f8f46e6f4ad4e1eb33f92500da29056ee64496f12f93
7
- data.tar.gz: 76f1ec690b2cc56c7e36ae3ee5ed6228c41246ae6fd40111bf3459ac8394dbe0bea6dfa2d2c36a58315cca08fc02aff5454a7355f7ad587c7de929c0d4961da1
6
+ metadata.gz: 1c3a9a1c8a7b2897b4d323d4096aa6158f6d4057cbff106677b59789f28edaa0f2e6f70bd6201cc7a65de599f34cb7152b81c9939df88b95431f0e4b51ea551f
7
+ data.tar.gz: 15374f2a69eabde66deb2480e69fbb7b693498a2c2c5672d2a6cde6dcbc0105232f94ecf41b5a2a456d52d1a72753c21efcd3fcc3c2895cbd60f0675b77d255e
data/app/view_models/workarea/admin/code_list_view_model.rb CHANGED
@@ -10,7 +10,7 @@ module Workarea
10
10
  end
11
11
 
12
12
  def used_count
13
- model.count - unused_promo_codes.count
13
+ model.promo_codes.count - unused_promo_codes.count
14
14
  end
15
15
 
16
16
  def last_used_at
data/app/views/workarea/admin/facets/_applied.html.haml CHANGED
@@ -10,7 +10,7 @@
10
10
  - @search.facet_selections.each do |facet, values|
11
11
  - values.each do |value|
12
12
  %li.browsing-controls__applied-filter
13
- %span= value.titleize
13
+ %span= facet_value_display_name(facet, value)
14
14
  = link_to facet_path(facet, value), class: 'browsing-controls__applied-remove-link' do
15
15
  = inline_svg('workarea/admin/icons/close.svg', class: 'browsing-controls__applied-icon svg-icon svg-icon--small svg-icon--black', title: t('workarea.admin.facets.applied.remove_filter'))
16
16
 
data/app/views/workarea/admin/pricing_discount_code_lists/_cards.html.haml CHANGED
@@ -45,7 +45,7 @@
45
45
  .grid
46
46
  .grid__cell.grid__cell--50
47
47
  .align-center
48
- %h2.heading.heading--no-margin= model.count
48
+ %h2.heading.heading--no-margin= model.promo_codes.count
49
49
  %p #{t('workarea.admin.pricing_discount_code_lists.cards.promo_codes.total')}
50
50
  .grid__cell.grid__cell--50
51
51
  .align-center
data/app/views/workarea/admin/pricing_discount_code_lists/promo_codes.html.haml CHANGED
@@ -17,7 +17,7 @@
17
17
 
18
18
  .view__container.view__container--narrow
19
19
  = render_cards_for(@code_list, :promo_codes)
20
- %p.align-center= t('workarea.admin.pricing_discount_code_lists.promo_code', count: @code_list.count)
20
+ %p.align-center= t('workarea.admin.pricing_discount_code_lists.promo_code', count: @code_list.promo_codes.count)
21
21
 
22
22
  %table
23
23
  %thead
data/test/view_models/workarea/admin/code_list_view_model_test.rb CHANGED
@@ -21,6 +21,11 @@ module Workarea
21
21
 
22
22
  view_model = CodeListViewModel.wrap(code_list)
23
23
  assert_equal(1, view_model.used_count)
24
+
25
+ code_list.promo_codes.create!(code: "#{code_list.prefix}123")
26
+
27
+ view_model = CodeListViewModel.wrap(code_list)
28
+ assert_equal(1, view_model.used_count)
24
29
  end
25
30
 
26
31
  def test_last_used_at
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: workarea-admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.4.34
4
+ version: 3.4.35
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-06-11 00:00:00.000000000 Z
11
+ date: 2020-06-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: workarea-core
@@ -16,28 +16,28 @@ dependencies:
16
16
  requirements:
17
17
  - - '='
18
18
  - !ruby/object:Gem::Version
19
- version: 3.4.34
19
+ version: 3.4.35
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.34
26
+ version: 3.4.35
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: workarea-storefront
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - '='
32
32
  - !ruby/object:Gem::Version
33
- version: 3.4.34
33
+ version: 3.4.35
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
38
  - - '='
39
39
  - !ruby/object:Gem::Version
40
- version: 3.4.34
40
+ version: 3.4.35
41
41
  description: Provides site administration functionality for the Workarea Commerce
42
42
  Platform.
43
43
  email: