workarea-admin 3.4.31 → 3.4.36

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 1d9be184547e30b4c1283ffd295b3b5eb8599b49b9c44d587c1e08e4ee7c44fc
-  data.tar.gz: ba0f3a791150097f3bb8852e590ab120b344cdddc4dc3a94ba0cf337d1852c6e
+SHA1:
+  metadata.gz: 8d18ceffd52a8ba4e7098980428f5f3ede7e0892
+  data.tar.gz: 3b29ccc5629cb4fa9556ecf576602b18bee63b92
 SHA512:
-  metadata.gz: ca7eaa689c15cd9408e6a7c2992e3ed01180b71fdda04d9ec48d19a72e05b38b6364f858935da4d7637cdb2544783dfd3a397284e71b06a30a8fec1fdae2b2b0
-  data.tar.gz: 9ab3e95af5627380150d5d837b09477d6de17b94ed0c3492c06b01af1a3e9e9ddcb6d4cdaa5238c7041e55ac0405cab7ed9bef8eb9b3e5dfb4d37efd049c352d
+  metadata.gz: d2633b07e8f39598b1ac66361bca9e4d2364555421f1ac40731c7cb471574dd67c674df3c6c7422db70b540a17d74990f40683dcea248b864759e03de2736e88
+  data.tar.gz: 5213ec59a16eca3ad97335ebf98b1b9699f7753405593ad8fb6b16104df3363baf3a96b8a9aa93502c9aa3eda5a382a8cfb0b7619a2ca44d902cb814db07778f

data/app/controllers/workarea/admin/bulk_action_sequential_product_edits_controller.rb

@@ -64,19 +64,21 @@ module Workarea
       end
 
       def set_details
-        HashUpdate.new(
+        @product.details = HashUpdate.new(
+          original: @product.details,
           adds: params[:new_details],
           updates: params[:details],
           removes: params[:details_to_remove]
-        ).apply(@product.details)
+        ).result
       end
 
       def set_filters
-        HashUpdate.new(
+        @product.filters = HashUpdate.new(
+          original: @product.filters,
           adds: params[:new_filters],
           updates: params[:filters],
           removes: params[:filters_to_remove]
-        ).apply(@product.filters)
+        ).result
       end
 
       def set_images

data/app/controllers/workarea/admin/catalog_products_controller.rb

@@ -64,19 +64,21 @@ module Workarea
     end
 
     def set_details
-      HashUpdate.new(
+      @product.details = HashUpdate.new(
+        original: @product.details,
         adds: params[:new_details],
         updates: params[:details],
         removes: params[:details_to_remove]
-      ).apply(@product.details)
+      ).result
     end
 
     def set_filters
-      HashUpdate.new(
+      @product.filters = HashUpdate.new(
+        original: @product.filters,
         adds: params[:new_filters],
         updates: params[:filters],
         removes: params[:filters_to_remove]
-      ).apply(@product.filters)
+      ).result
     end
   end
 end

data/app/controllers/workarea/admin/catalog_variants_controller.rb

@@ -83,11 +83,12 @@ module Workarea
     end
 
     def set_details
-      HashUpdate.new(
+      @variant.details = HashUpdate.new(
+        original: @variant.details,
         adds: params[:new_details],
         updates: params[:details],
         removes: params[:details_to_remove]
-      ).apply(@variant.details)
+      ).result
     end
   end
 end

data/app/controllers/workarea/admin/create_catalog_products_controller.rb

@@ -74,8 +74,14 @@ module Workarea
       end
 
       def save_details
-        HashUpdate.new(updates: params[:filters]).apply(@product.filters)
-        HashUpdate.new(updates: params[:details]).apply(@product.details)
+        @product.filters = HashUpdate
+          .new(original: @product.filters, updates: params[:filters])
+          .result
+
+        @product.details = HashUpdate
+          .new(original: @product.details, updates: params[:details])
+          .result
+
         @product.save!
 
         flash[:success] = t('workarea.admin.create_catalog_products.flash_messages.saved')

data/app/view_models/workarea/admin/code_list_view_model.rb

@@ -10,7 +10,7 @@ module Workarea
       end
 
       def used_count
-        model.count - unused_promo_codes.count
+        model.promo_codes.count - unused_promo_codes.count
       end
 
       def last_used_at

data/app/views/workarea/admin/create_users/admin.html.haml

@@ -140,6 +140,8 @@
                           = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon')
                           %span= t('workarea.admin.users.permissions.help')
 
+                    = append_partials('admin.user_permissions')
+
       .workflow-bar
         .grid.grid--middle
           .grid__cell.grid__cell--20

data/app/views/workarea/admin/facets/_applied.html.haml

@@ -10,7 +10,7 @@
       - @search.facet_selections.each do |facet, values|
         - values.each do |value|
           %li.browsing-controls__applied-filter
-            %span= value.titleize
+            %span= facet_value_display_name(facet, value)
             = link_to facet_path(facet, value), class: 'browsing-controls__applied-remove-link' do
               = 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'))
 

data/app/views/workarea/admin/insights/_most_discounted_products.html.haml

@@ -18,15 +18,15 @@
                 = result.product_id
               - else
                 = link_to result.product.name, catalog_product_path(result.product)
-          .insight__product-info
+          .insight__product-info.align-center
             %strong= insights_number_to_percentage(result.average_discount)
             = t('workarea.admin.insights.most_discounted_products.average_discount')
-          .insight__product-info
+          .insight__product-info.align-center
             %strong= insights_number_to_percentage(result.discount_rate)
             = t('workarea.admin.insights.most_discounted_products.discount_rate')
-          .insight__product-info
+          .insight__product-info.align-center
             %strong= number_with_delimiter(result.units_sold)
             = t('workarea.admin.insights.most_discounted_products.units_sold')
-          .insight__product-info
+          .insight__product-info.align-center
             %strong= insights_number_to_percentage(result.conversion_rate)
             = t('workarea.admin.insights.most_discounted_products.conversion_rate')

data/app/views/workarea/admin/pricing_discount_code_lists/_cards.html.haml

@@ -45,7 +45,7 @@
             .grid
               .grid__cell.grid__cell--50
                 .align-center
-                  %h2.heading.heading--no-margin= model.count
+                  %h2.heading.heading--no-margin= model.promo_codes.count
                   %p #{t('workarea.admin.pricing_discount_code_lists.cards.promo_codes.total')}
               .grid__cell.grid__cell--50
                 .align-center

data/app/views/workarea/admin/pricing_discount_code_lists/promo_codes.html.haml

@@ -17,7 +17,7 @@
 
   .view__container.view__container--narrow
     = render_cards_for(@code_list, :promo_codes)
-    %p.align-center= t('workarea.admin.pricing_discount_code_lists.promo_code', count: @code_list.count)
+    %p.align-center= t('workarea.admin.pricing_discount_code_lists.promo_code', count: @code_list.promo_codes.count)
 
     %table
       %thead

data/test/integration/workarea/admin/assets_integration_test.rb

@@ -6,9 +6,7 @@ module Workarea
       include Admin::IntegrationTest
 
       def test_ensures_cors_policy_for_bulk_upload
-        Workarea.s3.expects(:get_bucket_cors).returns(
-          mock('Excon::Response', data: { body: { 'CORSConfiguration' => [] } })
-        )
+        Workarea.s3.expects(:get_bucket_cors).returns(mock_s3_cors_response).once
         Workarea.s3.expects(:put_bucket_cors).once
         get admin.content_assets_path
         assert(response.ok?)

data/test/integration/workarea/admin/products_integration_test.rb

@@ -16,6 +16,19 @@ module Workarea
         assert(product.active)
       end
 
+      def test_updating_hash_fields_in_locales
+        set_locales(available: [:en, :es], default: :en, current: :en)
+        product = create_product(filters_translations: { 'en' => { 'Size' => ['Large'] } })
+
+        patch admin.catalog_product_path(product, locale: 'es'),
+          params: { new_filters: %w(Color Roja) }
+
+        assert_equal(
+          { 'en' => { 'Size' => ['Large'] }, 'es' => { 'Color' => ['Roja'] } },
+          product.reload.filters_translations
+        )
+      end
+
       def test_returns_a_list_of_filters
         create_product(filters:  { 'Color' => 'Blue' })
 

data/test/system/workarea/admin/assets_system_test.rb

@@ -5,14 +5,7 @@ module Workarea
     class AssetsSystemTest < SystemTest
       include Admin::IntegrationTest
 
-      def mock_get_bucket_cors
-        Workarea.s3.expects(:get_bucket_cors).returns(
-          mock('Excon::Response', data: { body: { 'CORSConfiguration' => [] } })
-        )
-      end
-
       def test_management
-        mock_get_bucket_cors
         visit admin.content_assets_path
         click_link 'add_asset'
 
@@ -38,7 +31,6 @@ module Workarea
       end
 
       def test_insertion
-        mock_get_bucket_cors
         asset = create_asset
 
         content = create_content(

data/test/view_models/workarea/admin/code_list_view_model_test.rb

@@ -21,6 +21,11 @@ module Workarea
 
         view_model = CodeListViewModel.wrap(code_list)
         assert_equal(1, view_model.used_count)
+
+        code_list.promo_codes.create!(code: "#{code_list.prefix}123")
+
+        view_model = CodeListViewModel.wrap(code_list)
+        assert_equal(1, view_model.used_count)
       end
 
       def test_last_used_at

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-admin
 version: !ruby/object:Gem::Version
-  version: 3.4.31
+  version: 3.4.36
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-15 00:00:00.000000000 Z
+date: 2020-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: workarea-core
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.31
+        version: 3.4.36
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.31
+        version: 3.4.36
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.31
+        version: 3.4.36
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.31
+        version: 3.4.36
 description: Provides site administration functionality for the Workarea Commerce
   Platform.
 email:
@@ -1401,7 +1401,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.6.14.1
 signing_key: 
 specification_version: 4
 summary: Admin for the Workarea Commerce Platform