workarea-admin 3.4.26 → 3.4.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0e2c945703ac548dfcc945ed6d711dbe855fba3de6a8cf8c672fbf6339b363f
-  data.tar.gz: 1b73600f15eea6c0f1cdfbd5bed3c7fa883aa9d7c72ea00e18875bd0b7e31acd
+  metadata.gz: 4bb83fb982468b7096266c1fead527458334ed164aec727c6376c73348d92d66
+  data.tar.gz: 729571edf5310fcab460513795bc64b70ecae6b6b7ca791d9e85fa53687ece81
 SHA512:
-  metadata.gz: 52c65ec95398243e4293bd332886daf477e665f7a6926cdf480045a8f16905a33ea723c28b2c440bb98f107416b016c32403049c9498a2b8f5499d2df42d87fd
-  data.tar.gz: 462354f06eb560655beebdbb993b055b6da194fb3d7cecbb7796a3912df845bda5c51bdc77b9dd8a7e526b544f3a1f28218389d5b370011975a3aab5ca384a8e
+  metadata.gz: 2f0947f2b9ec42924c63e23fbc1eedca69aba17b80700520177f025b2320b70e9606660c1d5c7f6314de5356f9650d4478bc88c45a655faaba467b75e3c10b91
+  data.tar.gz: 075dc9b989988f3dd34848a5bb1e6e2b95504ab0b446627a3193c0128efddfe54bacc25c4b85ee90c17544c6868bd592c453260f079dc5e4aba4561ec5c56f18

data/app/helpers/workarea/admin/content_helper.rb

@@ -34,9 +34,10 @@ module Workarea
       end
 
       def options_for_category(category_id)
-        return nil unless category_id.present?
+        model = Catalog::Category.where(id: category_id).first
+
+        return '' unless model.present?
 
-        model = Catalog::Category.find(category_id)
         options_for_select({ model.name => model.id }, model.id)
       end
 

data/app/views/workarea/admin/navigation_menus/index.html.haml

@@ -1,4 +1,4 @@
-- @page_title = t('workarea.admin.content_pages.index.page_title')
+- @page_title = t('workarea.admin.navigation_menus.index.page_title')
 
 
 .view

data/app/views/workarea/admin/orders/attributes.html.haml

@@ -112,6 +112,7 @@
                     %th
                       %span.data-pairs__name= t('workarea.admin.orders.attributes.totals.subtotal')
                     %td= number_to_currency @order.subtotal_price
+                  = append_partials('admin.order_attributes_subtotal', order: @order)
                   %tr
                     %th
                       %span.data-pairs__name= t('workarea.admin.orders.attributes.totals.shipping')

data/app/views/workarea/admin/shipping_services/edit.html.haml

@@ -25,6 +25,10 @@
           = label_tag 'service_tax_code', t('workarea.admin.fields.tax_code'), class: 'property__name'
           = text_field_tag 'service[tax_code]', @service.tax_code, class: 'text-box'
 
+        .property
+          = label_tag 'service_service_code', t('workarea.admin.fields.service_code'), class: 'property__name'
+          = text_field_tag 'service[service_code]', @service.service_code, class: 'text-box'
+
         .property
           = label_tag 'service_country', t('workarea.admin.fields.country'), class: 'property__name'
           = select_tag "service[country]", options_for_select(country_options, @service.country.try(:alpha2)), prompt: t('workarea.admin.shipping_services.options.not_specified')

data/app/views/workarea/admin/shipping_services/new.html.haml

@@ -25,6 +25,10 @@
           = label_tag 'service_tax_code', t('workarea.admin.fields.tax_code'), class: 'property__name'
           = text_field_tag 'service[tax_code]', @service.tax_code, class: 'text-box'
 
+        .property
+          = label_tag 'service_service_code', t('workarea.admin.fields.service_code'), class: 'property__name'
+          = text_field_tag 'service[service_code]', @service.service_code, class: 'text-box'
+
         .property
           = label_tag 'service_country', t('workarea.admin.fields.country'), class: 'property__name'
           = select_tag "service[country]", options_for_select(country_options, @service.country.try(:alpha2)), prompt: t('workarea.admin.shipping_services.options.not_specified')

data/config/locales/en.yml

@@ -1646,6 +1646,7 @@ en:
         searches: Searches
         send_account_creation_email: Notify Them by Email
         service: Service
+        service_code: Service Code
         services_file: Services File
         shipping: Shipping
         shipping_service_id: Shipping Service

data/test/helpers/workarea/admin/content_helper_test.rb

@@ -0,0 +1,17 @@
+require 'test_helper'
+
+module Workarea
+  module Admin
+    class ContentHelperTest < ViewTest
+      def test_options_for_category
+        category = create_category
+        deleted_category = create_category.tap(&:destroy)
+        options = %(<option selected="selected" value="#{category.id}">#{category.name}</option>)
+
+        assert_equal('', options_for_category(nil))
+        assert_equal('', options_for_category(deleted_category.id))
+        assert_equal(options, options_for_category(category.id))
+      end
+    end
+  end
+end

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

@@ -6,6 +6,9 @@ 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(:put_bucket_cors).once
         get admin.content_assets_path
         assert(response.ok?)

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

@@ -9,7 +9,8 @@ module Workarea
         shipping_service = {
           name:         'Shipping Service',
           tax_code:     '001',
-          country:      'US'
+          country:      'US',
+          service_code: 'FED'
         }
         post admin.shipping_services_path,
           params: { service: shipping_service, new_rates: [{ price: '7.00' }] }
@@ -20,6 +21,7 @@ module Workarea
         assert_equal('Shipping Service', service.name)
         assert_equal('001', service.tax_code)
         assert_equal(Country['US'], service.country)
+        assert_equal('FED', service.service_code)
       end
 
       def test_update

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

@@ -5,7 +5,14 @@ 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'
 
@@ -31,6 +38,7 @@ module Workarea
       end
 
       def test_insertion
+        mock_get_bucket_cors
         asset = create_asset
 
         content = create_content(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-admin
 version: !ruby/object:Gem::Version
-  version: 3.4.26
+  version: 3.4.27
 platform: ruby
 authors:
 - Ben Crouse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-22 00:00:00.000000000 Z
+date: 2020-02-21 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.26
+        version: 3.4.27
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.26
+        version: 3.4.27
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.26
+        version: 3.4.27
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.26
+        version: 3.4.27
 description: Provides site administration functionality for the Workarea Commerce
   Platform.
 email:
@@ -1182,6 +1182,7 @@ files:
 - test/dummy/script/rails
 - test/dummy/tmp/screenshots/.keep
 - test/helpers/workarea/admin/application_helper_test.rb
+- test/helpers/workarea/admin/content_helper_test.rb
 - test/helpers/workarea/admin/icons_helper_test.rb
 - test/helpers/workarea/admin/imports_helper_test.rb
 - test/helpers/workarea/admin/insights_helper_test.rb
@@ -1398,7 +1399,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Admin for the Workarea Commerce Platform