workarea-admin 3.5.4 → 3.5.5

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: 6b6bb950d14a9f2250d9ae103925174fc87044864b4adb46f4908f8bcc0207b6
4
- data.tar.gz: 025a81b2cad5b8fe79fec136013a8046b1843af8e2d229068370289d0df0e95f
3
+ metadata.gz: 05c3df00470a31e816821532e171ac24779d1bd24939a26d4ebb89fdeda1958b
4
+ data.tar.gz: 67bf84adf3a1b7af8d418079fb24bce185bd9faada61424be0cb6a12f7a6f355
5
5
  SHA512:
6
- metadata.gz: 46bccff3eebf3e8c255842732f53ba3058e9502bc67a6286799a24dd7d05c6283550c5afc9225c5ddc99f720d6337d8a0ded7e511c226e8c4ddc4e27002d41d7
7
- data.tar.gz: 18394219d4e584d9b842fccf1aca6a7009c9d71e6e42fa4c858de7958189cad82e16c9ef236f19d474928a06df2451c5051db88ab7a5fb9ec381e0dc424f7e9b
6
+ metadata.gz: 2ddc8fc67de539abf69940ae959bb52fe8b6d78166729c73ed65e840d597ccc843b25dc5bee8845d434f9c93ad2263a7c5b698e75443e263389d9eaef9c2e3c8
7
+ data.tar.gz: 48a1dea49c725eee0ad9ad9671a5d8bb7858c837863476c438a364cea14122cef40420d53258911c7a36cdc43f06cf3a71b9aa5f26edcba5ee2885e286be221b
@@ -16,6 +16,8 @@ WORKAREA.registerModule('releaseReminder', (function () {
16
16
  no = function (event) {
17
17
  event.preventDefault();
18
18
 
19
+ if (WORKAREA.environment.isTest) { return; }
20
+
19
21
  var form = JST['workarea/admin/templates/release_select_form']({
20
22
  url: WORKAREA.routes.admin.releaseSessionPath(),
21
23
  csrfParam: $('meta[name=csrf-param]').attr('content'),
@@ -9,7 +9,7 @@ module Workarea
9
9
  def index
10
10
  @return = params[:return_to].to_h
11
11
 
12
- @system_block_types = Workarea.config.content_block_types
12
+ @system_block_types = Configuration::ContentBlocks.types
13
13
  @content_presets = Content::Preset.all.to_a
14
14
  end
15
15
 
@@ -44,9 +44,10 @@ module Workarea
44
44
  end
45
45
 
46
46
  def options_for_category(category_id)
47
- return nil unless category_id.present?
47
+ model = Catalog::Category.where(id: category_id).first
48
+
49
+ return '' unless model.present?
48
50
 
49
- model = Catalog::Category.find(category_id)
50
51
  options_for_select({ model.name => model.id }, model.id)
51
52
  end
52
53
 
@@ -1,4 +1,4 @@
1
- - @page_title = t('workarea.admin.content_pages.index.page_title')
1
+ - @page_title = t('workarea.admin.navigation_menus.index.page_title')
2
2
 
3
3
 
4
4
  .view
@@ -116,6 +116,7 @@
116
116
  %th
117
117
  %span.data-pairs__name= t('workarea.admin.orders.attributes.totals.subtotal')
118
118
  %td= number_to_currency @order.subtotal_price
119
+ = append_partials('admin.order_attributes_subtotal', order: @order)
119
120
  %tr
120
121
  %th
121
122
  %span.data-pairs__name= t('workarea.admin.orders.attributes.totals.shipping')
@@ -25,6 +25,10 @@
25
25
  = label_tag 'service_tax_code', t('workarea.admin.fields.tax_code'), class: 'property__name'
26
26
  = text_field_tag 'service[tax_code]', @service.tax_code, class: 'text-box'
27
27
 
28
+ .property
29
+ = label_tag 'service_service_code', t('workarea.admin.fields.service_code'), class: 'property__name'
30
+ = text_field_tag 'service[service_code]', @service.service_code, class: 'text-box'
31
+
28
32
  .property
29
33
  = label_tag 'service_country', t('workarea.admin.fields.country'), class: 'property__name'
30
34
  = select_tag "service[country]", options_for_select(country_options, @service.country.try(:alpha2)), prompt: t('workarea.admin.shipping_services.options.not_specified')
@@ -25,6 +25,10 @@
25
25
  = label_tag 'service_tax_code', t('workarea.admin.fields.tax_code'), class: 'property__name'
26
26
  = text_field_tag 'service[tax_code]', @service.tax_code, class: 'text-box'
27
27
 
28
+ .property
29
+ = label_tag 'service_service_code', t('workarea.admin.fields.service_code'), class: 'property__name'
30
+ = text_field_tag 'service[service_code]', @service.service_code, class: 'text-box'
31
+
28
32
  .property
29
33
  = label_tag 'service_country', t('workarea.admin.fields.country'), class: 'property__name'
30
34
  = select_tag "service[country]", options_for_select(country_options, @service.country.try(:alpha2)), prompt: t('workarea.admin.shipping_services.options.not_specified')
@@ -1770,6 +1770,7 @@ en:
1770
1770
  segments: Segments
1771
1771
  send_account_creation_email: Notify Them by Email
1772
1772
  service: Service
1773
+ service_code: Service Code
1773
1774
  services_file: Services File
1774
1775
  sessions: Sessions
1775
1776
  shipping: Shipping
@@ -0,0 +1,17 @@
1
+ require 'test_helper'
2
+
3
+ module Workarea
4
+ module Admin
5
+ class ContentHelperTest < ViewTest
6
+ def test_options_for_category
7
+ category = create_category
8
+ deleted_category = create_category.tap(&:destroy)
9
+ options = %(<option selected="selected" value="#{category.id}">#{category.name}</option>)
10
+
11
+ assert_equal('', options_for_category(nil))
12
+ assert_equal('', options_for_category(deleted_category.id))
13
+ assert_equal(options, options_for_category(category.id))
14
+ end
15
+ end
16
+ end
17
+ end
@@ -6,6 +6,7 @@ module Workarea
6
6
  include Admin::IntegrationTest
7
7
 
8
8
  def test_ensures_cors_policy_for_bulk_upload
9
+ Workarea.s3.expects(:get_bucket_cors).returns(mock_s3_cors_response).once
9
10
  Workarea.s3.expects(:put_bucket_cors).once
10
11
  get admin.content_assets_path
11
12
  assert(response.ok?)
@@ -9,7 +9,8 @@ module Workarea
9
9
  shipping_service = {
10
10
  name: 'Shipping Service',
11
11
  tax_code: '001',
12
- country: 'US'
12
+ country: 'US',
13
+ service_code: 'FED'
13
14
  }
14
15
  post admin.shipping_services_path,
15
16
  params: { service: shipping_service, new_rates: [{ price: '7.00' }] }
@@ -20,6 +21,7 @@ module Workarea
20
21
  assert_equal('Shipping Service', service.name)
21
22
  assert_equal('001', service.tax_code)
22
23
  assert_equal(Country['US'], service.country)
24
+ assert_equal('FED', service.service_code)
23
25
  end
24
26
 
25
27
  def test_update
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.5.4
4
+ version: 3.5.5
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-01-22 00:00:00.000000000 Z
11
+ date: 2020-02-21 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.5.4
19
+ version: 3.5.5
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.4
26
+ version: 3.5.5
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.5.4
33
+ version: 3.5.5
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.5.4
40
+ version: 3.5.5
41
41
  description: Provides site administration functionality for the Workarea Commerce
42
42
  Platform.
43
43
  email:
@@ -1288,6 +1288,7 @@ files:
1288
1288
  - test/dummy/tmp/screenshots/.keep
1289
1289
  - test/helpers/workarea/admin/application_helper_test.rb
1290
1290
  - test/helpers/workarea/admin/buttons_helper_test.rb
1291
+ - test/helpers/workarea/admin/content_helper_test.rb
1291
1292
  - test/helpers/workarea/admin/facets_helper_test.rb
1292
1293
  - test/helpers/workarea/admin/icons_helper_test.rb
1293
1294
  - test/helpers/workarea/admin/imports_helper_test.rb
@@ -1522,7 +1523,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
1522
1523
  - !ruby/object:Gem::Version
1523
1524
  version: '0'
1524
1525
  requirements: []
1525
- rubygems_version: 3.1.2
1526
+ rubygems_version: 3.0.6
1526
1527
  signing_key:
1527
1528
  specification_version: 4
1528
1529
  summary: Admin for the Workarea Commerce Platform