workarea-admin 3.4.35 → 3.4.40

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.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/stylesheets/workarea/admin/components/_toggle_button.scss +4 -0
  3. data/app/controllers/workarea/admin/bulk_variant_saving.rb +2 -1
  4. data/app/views/workarea/admin/catalog_product_images/edit.html.haml +1 -1
  5. data/app/views/workarea/admin/catalog_variants/edit.html.haml +0 -5
  6. data/app/views/workarea/admin/catalog_variants/new.html.haml +0 -5
  7. data/app/views/workarea/admin/content/_edit.html.haml +1 -1
  8. data/app/views/workarea/admin/create_users/admin.html.haml +2 -0
  9. data/app/views/workarea/admin/shared/_toggle_button.html.haml +1 -1
  10. data/config/locales/en.yml +1 -2
  11. metadata +6 -6
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ed11773874c838f85f62a2f15513b10f77eaee7662388c377037b43d22d64887
4
- data.tar.gz: 93e38cccb74c77a6cf470c16295da7c49e5fe08eec53ba281ffb510c3c79af27
3
+ metadata.gz: fede43e115b6d31e72911580a8cc645b3aa5fcf832fd8fb852a9573eba0b0c36
4
+ data.tar.gz: 1baf9db2421c79be86be5fc9e3a0feb0584c1adefd6ec331e9fa602945e27528
5
5
  SHA512:
6
- metadata.gz: 1c3a9a1c8a7b2897b4d323d4096aa6158f6d4057cbff106677b59789f28edaa0f2e6f70bd6201cc7a65de599f34cb7152b81c9939df88b95431f0e4b51ea551f
7
- data.tar.gz: 15374f2a69eabde66deb2480e69fbb7b693498a2c2c5672d2a6cde6dcbc0105232f94ecf41b5a2a456d52d1a72753c21efcd3fcc3c2895cbd60f0675b77d255e
6
+ metadata.gz: f3a221e08bc1de51163a31a1ab052e8775714ed046d6fb358d178f2fd106d0e3e2e95e3bd6e6a66dedb86f51dfb992a8daf21099f19e98a8942c16f02aefed98
7
+ data.tar.gz: 1fd67b28d825b84faba507e7c8ac83075e0ad025e67632e5cc63fd890663b2e1a187ee9b4d5caac72b7b5c95e0b36c3d8a183fc4233071bd8262f8730c531e29
data/app/assets/stylesheets/workarea/admin/components/_toggle_button.scss CHANGED
@@ -20,6 +20,10 @@ $toggle-button-status-negative-color: $red !default;
20
20
  display: inline-block;
21
21
  }
22
22
 
23
+ .toggle-button--disabled {
24
+ opacity: 0.5;
25
+ }
26
+
23
27
  /**
24
28
  * 1. provides positiioning context for `.toggle-button__label`
25
29
  * 2. height + vertical margin = `.text-box` height
data/app/controllers/workarea/admin/bulk_variant_saving.rb CHANGED
@@ -21,8 +21,9 @@ module Workarea
21
21
  end
22
22
 
23
23
  if attributes[:inventory].present?
24
- inventory = Inventory::Sku.find_or_create_by(id: variant.sku)
24
+ inventory = Inventory::Sku.find_or_initialize_by(id: variant.sku)
25
25
  inventory.available = attributes[:inventory]
26
+ inventory.policy = 'standard' if inventory.new_record?
26
27
  inventory.save!
27
28
  end
28
29
  end
data/app/views/workarea/admin/catalog_product_images/edit.html.haml CHANGED
@@ -25,7 +25,7 @@
25
25
  .product-images__image-group
26
26
  .product-images__image
27
27
  .product-images__image-summary
28
- .product-images__image-summary-container= image_tag product_image_url(@image, :small), alt: "#{@image.option} #{t('workarea.admin.catalog_product_images.edit.image')}", id: @image.option.parameterize, class: 'product-images__image-summary-image'
28
+ .product-images__image-summary-container= image_tag product_image_url(@image, :small), alt: "#{@image.option} #{t('workarea.admin.catalog_product_images.edit.image')}", class: 'product-images__image-summary-image'
29
29
 
30
30
  .section
31
31
  %h2= t('workarea.admin.catalog_product_images.edit.edit_image')
data/app/views/workarea/admin/catalog_variants/edit.html.haml CHANGED
@@ -63,11 +63,6 @@
63
63
  .property
64
64
  = text_field_tag 'new_details[]', nil, id: nil, class: 'text-box text-box--i18n', title: t('workarea.admin.catalog_variants.edit.options.new_attribute_value'), placeholder: t('workarea.admin.catalog_variants.edit.options.new_attribute_value_placeholder')
65
65
  %span.property__note= t('workarea.admin.catalog_variants.edit.options.new_attribute_value_note')
66
- %span.property__note
67
- = t('workarea.admin.catalog_variants.edit.options.new_attribute_value_csv')
68
- = link_to '#csv-help', data: { tooltip: '' } do
69
- = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon svg-icon--small svg-icon--blue', title: t('workarea.admin.catalog_variants.edit.options.learn_more'))
70
- = render 'workarea/admin/shared/csv_formatting_tooltip'
71
66
  %td.align-center -
72
67
 
73
68
  .workflow-bar
data/app/views/workarea/admin/catalog_variants/new.html.haml CHANGED
@@ -55,11 +55,6 @@
55
55
  .property
56
56
  = text_field_tag 'new_details[]', nil, id: nil, class: 'text-box text-box--i18n', title: t('workarea.admin.catalog_variants.new.options.new_attribute_value'), placeholder: t('workarea.admin.catalog_variants.new.options.new_attribute_value_placeholder')
57
57
  %span.property__note= t('workarea.admin.catalog_variants.new.options.new_attribute_value_note')
58
- %span.property__note
59
- = t('workarea.admin.catalog_variants.new.options.new_attribute_value_csv')
60
- = link_to '#csv-help', data: { tooltip: '' } do
61
- = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon svg-icon--small svg-icon--blue', title: t('workarea.admin.catalog_variants.new.options.learn_more'))
62
- = render 'workarea/admin/shared/csv_formatting_tooltip'
63
58
  %td.align-center -
64
59
 
65
60
  .workflow-bar
data/app/views/workarea/admin/content/_edit.html.haml CHANGED
@@ -7,7 +7,7 @@
7
7
  .grid.grid--middle
8
8
  .grid__cell.grid__cell--50
9
9
  - if content.show_areas?
10
- %span= content.name
10
+ %span #{t('workarea.admin.content.edit.current_area')}:
11
11
  = inline_svg('workarea/admin/icons/navigate_next.svg', class: 'svg-icon svg-icon--small svg-icon--white')
12
12
  = form_tag request.path, method: 'get', class: 'content-editor__area-select-form' do
13
13
  = select_tag 'area_id', options_for_select(content.area_options, content.current_area), data: { form_submitting_control: '' }
data/app/views/workarea/admin/create_users/admin.html.haml CHANGED
@@ -140,6 +140,8 @@
140
140
  = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon')
141
141
  %span= t('workarea.admin.users.permissions.help')
142
142
 
143
+ = append_partials('admin.user_permissions')
144
+
143
145
  .workflow-bar
144
146
  .grid.grid--middle
145
147
  .grid__cell.grid__cell--20
data/app/views/workarea/admin/shared/_toggle_button.html.haml CHANGED
@@ -1,4 +1,4 @@
1
- .toggle-button{ data: data }
1
+ .toggle-button{ data: data, class: disabled ? 'toggle-button--disabled' : nil }
2
2
  .toggle-button__switch
3
3
  = radio_button_tag input_name, true, condition, disabled: disabled, class: 'toggle-button__input toggle-button__input--positive', title: title_true, id: "#{dom_id}_true"
4
4
  = label_tag "#{dom_id}_false", label_true, class: 'toggle-button__label toggle-button__label--positive', id: "#{dom_id}_false_label"
data/config/locales/en.yml CHANGED
@@ -485,7 +485,6 @@ en:
485
485
  new_attribute_name_note: 'Example: Material'
486
486
  new_attribute_name_placeholder: New Attribute Name
487
487
  new_attribute_value: New Attribute Value
488
- new_attribute_value_csv: 'Comma separated: just, like, this'
489
488
  new_attribute_value_note: 'Example: Cotton'
490
489
  new_attribute_value_placeholder: New Attribute Value
491
490
  remove: Remove
@@ -524,7 +523,6 @@ en:
524
523
  new_attribute_name_note: 'Example: Material'
525
524
  new_attribute_name_placeholder: New Attribute Name
526
525
  new_attribute_value: New Attribute Value
527
- new_attribute_value_csv: 'Comma separated: just, like, this'
528
526
  new_attribute_value_note: 'Example: Cotton'
529
527
  new_attribute_value_placeholder: New Attribute Value
530
528
  remove: Remove
@@ -664,6 +662,7 @@ en:
664
662
  loading: Loading...
665
663
  preview: Preview
666
664
  title: Content for %{content}
665
+ current_area: 'Current Area'
667
666
  form:
668
667
  all_blocks: All blocks
669
668
  cancel: Cancel
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.35
4
+ version: 3.4.40
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-25 00:00:00.000000000 Z
11
+ date: 2020-09-16 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.35
19
+ version: 3.4.40
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.35
26
+ version: 3.4.40
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.35
33
+ version: 3.4.40
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.35
40
+ version: 3.4.40
41
41
  description: Provides site administration functionality for the Workarea Commerce
42
42
  Platform.
43
43
  email: