workarea-admin 3.5.4 → 3.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b6bb950d14a9f2250d9ae103925174fc87044864b4adb46f4908f8bcc0207b6
-  data.tar.gz: 025a81b2cad5b8fe79fec136013a8046b1843af8e2d229068370289d0df0e95f
+  metadata.gz: 05c3df00470a31e816821532e171ac24779d1bd24939a26d4ebb89fdeda1958b
+  data.tar.gz: 67bf84adf3a1b7af8d418079fb24bce185bd9faada61424be0cb6a12f7a6f355
 SHA512:
-  metadata.gz: 46bccff3eebf3e8c255842732f53ba3058e9502bc67a6286799a24dd7d05c6283550c5afc9225c5ddc99f720d6337d8a0ded7e511c226e8c4ddc4e27002d41d7
-  data.tar.gz: 18394219d4e584d9b842fccf1aca6a7009c9d71e6e42fa4c858de7958189cad82e16c9ef236f19d474928a06df2451c5051db88ab7a5fb9ec381e0dc424f7e9b
+  metadata.gz: 2ddc8fc67de539abf69940ae959bb52fe8b6d78166729c73ed65e840d597ccc843b25dc5bee8845d434f9c93ad2263a7c5b698e75443e263389d9eaef9c2e3c8
+  data.tar.gz: 48a1dea49c725eee0ad9ad9671a5d8bb7858c837863476c438a364cea14122cef40420d53258911c7a36cdc43f06cf3a71b9aa5f26edcba5ee2885e286be221b

data/app/assets/javascripts/workarea/admin/modules/release_reminder.js

@@ -16,6 +16,8 @@ WORKAREA.registerModule('releaseReminder', (function () {
         no = function (event) {
             event.preventDefault();
 
+            if (WORKAREA.environment.isTest) { return; }
+
             var form = JST['workarea/admin/templates/release_select_form']({
                 url: WORKAREA.routes.admin.releaseSessionPath(),
                 csrfParam: $('meta[name=csrf-param]').attr('content'),

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

@@ -9,7 +9,7 @@ module Workarea
     def index
       @return = params[:return_to].to_h
 
-      @system_block_types = Workarea.config.content_block_types
+      @system_block_types = Configuration::ContentBlocks.types
       @content_presets = Content::Preset.all.to_a
     end
 

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

@@ -44,9 +44,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

@@ -116,6 +116,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

@@ -1770,6 +1770,7 @@ en:
         segments: Segments
         send_account_creation_email: Notify Them by Email
         service: Service
+        service_code: Service Code
         services_file: Services File
         sessions: Sessions
         shipping: Shipping

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,7 @@ module Workarea
       include Admin::IntegrationTest
 
       def test_ensures_cors_policy_for_bulk_upload
+        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/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: workarea-admin
 version: !ruby/object:Gem::Version
-  version: 3.5.4
+  version: 3.5.5
 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.5.4
+        version: 3.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.4
+        version: 3.5.5
 - !ruby/object:Gem::Dependency
   name: workarea-storefront
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.4
+        version: 3.5.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.4
+        version: 3.5.5
 description: Provides site administration functionality for the Workarea Commerce
   Platform.
 email:
@@ -1288,6 +1288,7 @@ files:
 - test/dummy/tmp/screenshots/.keep
 - test/helpers/workarea/admin/application_helper_test.rb
 - test/helpers/workarea/admin/buttons_helper_test.rb
+- test/helpers/workarea/admin/content_helper_test.rb
 - test/helpers/workarea/admin/facets_helper_test.rb
 - test/helpers/workarea/admin/icons_helper_test.rb
 - test/helpers/workarea/admin/imports_helper_test.rb
@@ -1522,7 +1523,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