workarea-admin 3.4.29 → 3.4.30

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: 9da8bc75f20143ab5701f535e4cce9e2b4a84f9330faab4cbd5fed620cdf6093
4
- data.tar.gz: 6e06dfa75cc2b6292032eba0cd2ca07b14b2948b582e33eeecac0a1320a8646d
3
+ metadata.gz: a360239bae5d7f47d510ebc18a11595afde7d7c7a1b822e41083c6d298a47ae5
4
+ data.tar.gz: dd95f7e287f1a63657f8b0f8b7c47edaeb6c03cef4dff291c3ba83787bc731a8
5
5
  SHA512:
6
- metadata.gz: 0b679c8124fd1b8d5ebf95d68665229a27ba2c16ca6299bac8cc578181b3e14fd2bbca99fc9bc1f0c744699121aa793f39ef2c6ea934ab6d73f995423de4ba65
7
- data.tar.gz: 935c49a925308f4158eb9800bab1775ccd2e3383306126da65974436e4c59bd951f272c1730811c12cbd78bdc67f8bf79c33655fe6da07ebc5e285d416535162
6
+ metadata.gz: 3e06bc1c328459a5a4cdb8ae34c79c6a91cf666b459ddf57b5fa9b126ba005b04d49041bd68b5d1040cf6ca28a1cdcc322f614fdb13f88afe8a873e2c3b1381b
7
+ data.tar.gz: 406f941a897e66178fb366ac14a047cee7b8677f7b53857e37b1e7cfc34cfc7fa022a014d916e1db5532f85ea089b1803d509750100fd567b91dc84c4a1accd0
@@ -62,7 +62,9 @@ module Workarea
62
62
  #
63
63
  # @return [String]
64
64
  def sell_price
65
+ return if min_price.blank?
65
66
  return min_price.format unless show_range?
67
+
66
68
  "#{max_price.format} – #{min_price.format}"
67
69
  end
68
70
  end
@@ -28,7 +28,7 @@
28
28
 
29
29
  .property
30
30
  = label_tag 'product[meta_description]', t('workarea.admin.create_catalog_products.content.meta_description'), class: 'property__name'
31
- = text_field_tag 'product[meta_description]', @product.meta_description, class: 'text-box text-box--i18n', placeholder: t('workarea.admin.create_catalog_products.content.defaults_to_a_truncated_description')
31
+ = text_field_tag 'product[meta_description]', @product.meta_description, class: 'text-box text-box--i18n', placeholder: t('workarea.admin.create_catalog_products.content.defaults_to_description')
32
32
  %span.property__note= t('workarea.admin.create_catalog_products.content.provides_a_summary_that_is_displayed_on_search_engine_result_pages')
33
33
 
34
34
  .workflow-bar
@@ -64,7 +64,7 @@
64
64
  = upcoming_changesets_icon_for(result)
65
65
  = append_partials('admin.pricing_skus_additional_fields', result: result)
66
66
  %td.align-right= number_to_currency result.msrp
67
- %td.align-right= result.sell_price
67
+ %td.align-right= result.sell_price || '–'
68
68
  %td.align-center= t("workarea.admin.#{result.on_sale?}")
69
69
  %td.align-center= t("workarea.admin.#{result.discountable?}")
70
70
  %td= local_time_ago(result.updated_at)
@@ -2,7 +2,7 @@
2
2
 
3
3
  .view
4
4
  .view__header
5
- .grid.grid--middle.grid--right
5
+ .grid.grid--right
6
6
  .grid__cell.grid__cell--50
7
7
  .view__heading
8
8
  = link_to "↑ #{t('workarea.admin.users.index.dashboard_link')}", people_dashboards_path, class: 'view__dashboard-button'
@@ -916,6 +916,7 @@ en:
916
916
  browser_title: Browser Title
917
917
  cancel: Cancel
918
918
  defaults_to_a_truncated_description: "(defaults to a truncated description)"
919
+ defaults_to_description: "(defaults to description)"
919
920
  description: Description
920
921
  meta_description: Meta Description
921
922
  or_skip_this: or skip this
@@ -252,6 +252,17 @@ module Workarea
252
252
  )
253
253
  end
254
254
  end
255
+
256
+ def test_sorting_by_recency
257
+ create_user(email: 'foo-one@workarea.com', updated_at: 1.day.ago)
258
+ create_user(email: 'foo-two@workarea.com', updated_at: 1.hour.ago)
259
+ get admin.jump_to_path(q: 'foo')
260
+
261
+ results = JSON.parse(response.body)['results']
262
+ assert_equal(2, results.length)
263
+ assert_match('foo-two@workarea.com', results.first['label'])
264
+ assert_match('foo-one@workarea.com', results.second['label'])
265
+ end
255
266
  end
256
267
  end
257
268
  end
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.29
4
+ version: 3.4.30
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-03-17 00:00:00.000000000 Z
11
+ date: 2020-03-31 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.29
19
+ version: 3.4.30
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.29
26
+ version: 3.4.30
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.29
33
+ version: 3.4.30
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.29
40
+ version: 3.4.30
41
41
  description: Provides site administration functionality for the Workarea Commerce
42
42
  Platform.
43
43
  email:
@@ -1401,7 +1401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1401
1401
  - !ruby/object:Gem::Version
1402
1402
  version: '0'
1403
1403
  requirements: []
1404
- rubygems_version: 3.0.6
1404
+ rubygems_version: 3.0.3
1405
1405
  signing_key:
1406
1406
  specification_version: 4
1407
1407
  summary: Admin for the Workarea Commerce Platform