workarea-admin 3.4.45 → 3.5.0.beta.1

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

@@ -10,43 +10,82 @@
 
   .view__container
     = render_cards_for(@category, :rates)
-    %h2.view__heading= pluralize(@rates.count, 'Rate')
 
+    .browsing-controls.browsing-controls--with-divider.browsing-controls--center
+      = form_tag tax_category_rates_path, method: :get, id: 'rates_search_form', class: 'browsing-controls__form' do
+        .browsing-controls__sort
+          .property.property--inline
+            = label_tag 'sort', t('workarea.admin.search.sort_by'), class: 'property__name'
+            = select_tag 'sort', options_for_select(sort_options(@rates), params[:sort]), data: { form_submitting_control: '' }
+        .browsing-controls__search
+          .search-form.search-form--large
+            = text_field_tag :q, params[:q], class: 'search-form__input', id: 'search_rates', title: t('workarea.admin.tax_rates.index.search_placeholder'), placeholder: t('workarea.admin.tax_rates.index.search_placeholder')
+            = button_tag t('workarea.admin.search.go'), value: 'search_rates', class: 'search-form__button'
+
+      %p.browsing-controls__count{ data: { browsing_controls_count: @rates.total_count } }
+        = t('workarea.admin.tax_rates.index.rates', count: @rates.total_count)
+
+  .view__container
     - if @rates.blank?
-      = link_to t('workarea.admin.tax_rates.index.empty_button'), new_data_file_tax_import_path(tax_category_id: @category.id), class: 'align-center'
+      %p.align-center= t('workarea.admin.tax_rates.index.empty_message')
     - else
-      %table
+      %table.index-table
         %thead
           %tr
-            %th= t('workarea.admin.tax_rates.index.table.percentage')
-            %th
+            %th.align-center= t('workarea.admin.tax_rates.index.table.country')
+            %th.align-center= t('workarea.admin.tax_rates.index.table.region')
+            %th.align-center= t('workarea.admin.tax_rates.index.table.postal_code')
+            %th.align-center= t('workarea.admin.tax_rates.index.table.country_percentage')
+            %th.align-center= t('workarea.admin.tax_rates.index.table.region_percentage')
+            %th.align-center= t('workarea.admin.tax_rates.index.table.postal_code_percentage')
+            %th.align-center
               = t('workarea.admin.tax_rates.index.table.min_value')
               = link_to '#min-value-tooltip', data: { tooltip: '' } do
                 = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon svg-icon--small svg-icon--blue', title: t('workarea.admin.tax_rates.index.table.min_value_link'))
               %span#min-value-tooltip.tooltip-content= t('workarea.admin.tax_rates.index.table.min_value_tooltip')
-            %th
+            %th.align-center
               = t('workarea.admin.tax_rates.index.table.max_value')
               = link_to '#max-value-tooltip', data: { tooltip: '' } do
                 = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon svg-icon--small svg-icon--blue', title: t('workarea.admin.tax_rates.index.table.max_value_link'))
               %span#max-value-tooltip.tooltip-content= t('workarea.admin.tax_rates.index.table.max_value_tooltip')
-            %th= t('workarea.admin.tax_rates.index.table.country')
-            %th= t('workarea.admin.tax_rates.index.table.region')
-            %th= t('workarea.admin.tax_rates.index.table.postal_code')
-            %th= t('workarea.admin.tax_rates.index.table.charge_on_shipping')
+            %th.align-center= t('workarea.admin.tax_rates.index.table.charge_on_shipping')
+            %th.align-right= t('workarea.admin.tax_rates.index.table.actions')
         %tbody
           - @rates.each do |rate|
-            %tr
-              %td= number_to_percentage(rate.percentage * 100, precision: 1)
-              %td= rate.tier_min.present? ? number_to_currency(rate.tier_min) : t('workarea.admin.tax_rates.index.not_applicable')
-              %td= rate.tier_max.present? ? number_to_currency(rate.tier_max) : t('workarea.admin.tax_rates.index.not_applicable')
-              %td= rate.country.alpha2
-              %td= rate.region
-              %td= rate.postal_code
-              %td= rate.charge_on_shipping ? t('workarea.admin.true') : t('workarea.admin.false')
+            %tr.index-table__row
+              %td.align-center= rate.country.try(&:alpha2) || '-'
+              %td.align-center= rate.region || '-'
+              %td.align-center= rate.postal_code.presence || '-'
+              %td.align-center= number_to_percentage(rate.country_percentage * 100, precision: 1)
+              %td.align-center= number_to_percentage(rate.region_percentage * 100, precision: 1)
+              %td.align-center= number_to_percentage(rate.postal_code_percentage * 100, precision: 1)
+              %td.align-center= rate.tier_min.present? ? number_to_currency(rate.tier_min) : t('workarea.admin.tax_rates.index.not_applicable')
+              %td.align-center= rate.tier_max.present? ? number_to_currency(rate.tier_max) : t('workarea.admin.tax_rates.index.not_applicable')
+              %td.align-center= rate.charge_on_shipping ? t('workarea.admin.true') : t('workarea.admin.false')
+              %td
+                .grid.grid--auto.grid--right
+                  .grid__cell
+                    = link_to edit_tax_category_rate_path(@category, rate), class: 'text-button' do
+                      %span.grid.grid--auto.grid--middle.grid--flush
+                        %span.grid__cell= t('workarea.admin.actions.edit')
+                        %span.grid__cell= inline_svg('workarea/admin/icons/edit.svg', class: 'text-button__icon')
+                  .grid__cell
+                    = link_to tax_category_rate_path(@category, rate), class: 'text-button text-button--destroy', data: { method: 'delete', confirm: t('workarea.admin.actions.delete_confirmation') } do
+                      %span.grid.grid--auto.grid--middle.grid--flush
+                        %span.grid__cell= t('workarea.admin.actions.delete')
+                        %span.grid__cell= inline_svg('workarea/admin/icons/delete.svg', class: 'text-button__icon')
+
 
     - if @rates.total_pages > 1
       = render 'workarea/admin/shared/pagination', collection: @rates
 
     .workflow-bar
-      .grid.grid--auto.grid--right.grid--middle
-        .grid__cell= link_to t('workarea.admin.tax_rates.index.button'), new_data_file_tax_import_path(tax_category_id: @category.id), id: 'bulk_import', class: 'workflow-bar__button workflow-bar__button--update'
+      .grid
+        .grid__cell.grid__cell--50
+          .grid.grid--auto.grid--middle
+            .grid__cell= link_to t('workarea.admin.tax_rates.index.import_button'), new_data_file_tax_import_path(tax_category_id: @category.id), id: 'bulk_import', class: 'workflow-bar__button'
+        .grid__cell.grid__cell--50
+          .grid.grid--auto.grid--right.grid--middle
+            .grid__cell
+              = link_to t('workarea.admin.tax_rates.index.new_button'), new_tax_category_rate_path, id: 'add_tax_category_rate', class: 'workflow-bar__button workflow-bar__button--create'
+

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

@@ -0,0 +1,62 @@
+- @page_title = t('workarea.admin.tax_rates.new.title', category: @category.name)
+
+.view
+  .view__header
+    .grid.grid--middle.grid--center
+      .grid__cell.grid__cell--50
+        .view__heading
+          = link_to_index_for(@rate)
+          %h1= @page_title
+
+  .view__container.view__container--narrow
+    = form_tag tax_category_rates_path(@category), method: :post, id: 'tax_category_form', data: { unsaved_changes: '' } do
+      .grid.grid--huge
+        .grid__cell.grid__cell--50
+          .property
+            = label_tag 'rate_country', t('workarea.admin.tax_rates.index.table.country'), class: 'property__name'
+            = text_field_tag 'rate[country]', @rate.country.try(&:alpha2), class: 'text-box'
+
+        .grid__cell.grid__cell--50
+          .property
+            = label_tag 'rate_country_percentage', t('workarea.admin.tax_rates.index.table.country_percentage'), class: 'property__name'
+            = number_field_tag 'rate[country_percentage]', @rate.country_percentage * 100, min: 0, max: 100, step: 0.01, class: 'text-box'
+
+        .grid__cell.grid__cell--50
+          .property
+            = label_tag 'rate_region', t('workarea.admin.tax_rates.index.table.region'), class: 'property__name'
+            = text_field_tag 'rate[region]', @rate.region, class: 'text-box'
+
+        .grid__cell.grid__cell--50
+          .property
+            = label_tag 'rate_region_percentage', t('workarea.admin.tax_rates.index.table.region_percentage'), class: 'property__name'
+            = number_field_tag 'rate[region_percentage]', @rate.region_percentage * 100, min: 0, max: 100, step: 0.01, class: 'text-box'
+
+        .grid__cell.grid__cell--50
+          .property
+            = label_tag 'rate_postal_code', t('workarea.admin.tax_rates.index.table.postal_code'), class: 'property__name'
+            = text_field_tag 'rate[postal_code]', @rate.postal_code, class: 'text-box'
+
+        .grid__cell.grid__cell--50
+          .property
+            = label_tag 'rate_postal_code_percentage', t('workarea.admin.tax_rates.index.table.postal_code_percentage'), class: 'property__name'
+            = number_field_tag 'rate[postal_code_percentage]', @rate.postal_code_percentage * 100, min: 0, max: 100, step: 0.01, class: 'text-box'
+
+        .grid__cell.grid__cell--33
+          .property
+            = label_tag 'rate_tier_min', t('workarea.admin.tax_rates.index.table.min_value'), class: 'property__name'
+            = text_field_tag 'rate[tier_min]', @rate.tier_min, class: 'text-box'
+
+        .grid__cell.grid__cell--33
+          .property
+            = label_tag 'rate_tier_max', t('workarea.admin.tax_rates.index.table.max_value'), class: 'property__name'
+            = text_field_tag 'rate[tier_max]', @rate.tier_max, class: 'text-box'
+
+        .grid__cell.grid__cell--33
+          .property
+            = label_tag 'rate_charge_on_shipping', t('workarea.admin.tax_rates.index.table.charge_on_shipping'), class: 'property__name'
+            = toggle_button_for 'rate[charge_on_shipping]', @rate.charge_on_shipping
+
+      .workflow-bar
+        .grid.grid--auto.grid--right.grid--middle
+          .grid__cell
+            = button_tag t('workarea.admin.tax_rates.new.create_button'), value: 'create_tax_rate', class: 'workflow-bar__button workflow-bar__button--create'

data/app/views/workarea/admin/timeline/show.html.haml

@@ -13,19 +13,20 @@
   .view__container
     = render_cards_for(@timeline.subject, :timeline)
 
-    - if @timeline.empty?
-      %p.heading--2.align-center= t('workarea.admin.timeline.no_activity')
-    - else
-      .grid.grid--center
-        .grid__cell.grid__cell--80-at-medium
-          .grid
-            - @timeline.unscheduled_changesets.each_with_index do |changeset, index|
-              .activity-group.activity-group--bordered
+  .view__container.view__container--narrow
+    .section
+      - if @timeline.empty?
+        %p.heading--2.align-center= t('workarea.admin.timeline.no_activity')
+      - else
+        - unless @timeline.unscheduled_changesets.empty?
+          .activity-group
+            .grid
+              - @timeline.unscheduled_changesets.each_with_index do |changeset, index|
                 .grid__cell.grid__cell--20
-                  - if index == 0
-                    .date-marker
+                  - if index.zero?
+                    .date-marker.date-marker--center
                       .date-marker__annotation= t('workarea.admin.timeline.unscheduled_changes')
-                      .date-marker__day ?
+                      .date-marker__unknown ?
                 .grid__cell.grid__cell--80
                   .activity
                     .activity__header
@@ -40,27 +41,28 @@
                               = hidden_field_tag :release_id, changeset.release.id
                               = hidden_field_tag :return_to, url_for(@timeline.subject)
                               = button_tag value: 'edit_changes', class: 'text-button' do
-                                %span= t('workarea.admin.timeline.edit')
-                                = inline_svg('workarea/admin/icons/edit.svg', class: 'text-button__icon')
+                                = inline_svg('workarea/admin/icons/edit.svg', class: 'text-button__icon', title: t('workarea.admin.timeline.edit'))
                           .grid__cell
                             = form_tag release_changeset_path(changeset.release, changeset), method: :delete, class: 'action-group__item', data: { deletion_form: { message: t('workarea.admin.timeline.delete_confirmation') } } do
-                              = button_tag value: 'delete_changeset', class: 'text-button' do
-                                %span= t('workarea.admin.actions.delete')
-                                = inline_svg('workarea/admin/icons/delete.svg', class: 'text-button__icon')
+                              = button_tag value: 'delete_changeset', class: 'text-button text-button--destroy' do
+                                = inline_svg('workarea/admin/icons/delete.svg', class: 'text-button__icon', title: t('workarea.admin.actions.delete'))
                     .activity__message
                       .release-changeset.release-changeset--activity
                         - changeset.changed_fields.each do |field|
                           = render_changeset_field(changeset, field)
 
-            - @timeline.upcoming_changesets.each_with_index do |changeset, index|
-              .activity-group.activity-group--bordered
+        - unless @timeline.upcoming_changesets.empty?
+          .activity-group
+            .grid
+              - @timeline.upcoming_changesets.each_with_index do |changeset, index|
                 .grid__cell.grid__cell--20
-                  .date-marker{ class: ('date-marker--no-date' if changeset.release_date.nil?) }
-                    - if index == 0
-                      .date-marker__annotation= t('workarea.admin.timeline.upcoming_changes')
-                    - if changeset.release_date.present?
-                      .date-marker__month= local_time(changeset.release_date, format: '%b')
-                      .date-marker__day= local_time(changeset.release_date, format: '%e')
+                  - if index.zero? || changeset.release_date.present?
+                    .date-marker
+                      - if index.zero?
+                        .date-marker__annotation= t('workarea.admin.timeline.upcoming_changes')
+                      - if changeset.release_date.present?
+                        .date-marker__month= local_time(changeset.release_date, format: '%b')
+                        .date-marker__day= local_time(changeset.release_date, format: '%e')
                 .grid__cell.grid__cell--80
                   .activity
                     .activity__header
@@ -77,32 +79,23 @@
                               = hidden_field_tag :release_id, changeset.release.id
                               = hidden_field_tag :return_to, url_for(@timeline.subject)
                               = button_tag value: 'edit_changes', class: 'text-button' do
-                                %span= t('workarea.admin.timeline.edit')
-                                = inline_svg('workarea/admin/icons/edit.svg', class: 'text-button__icon')
+                                = inline_svg('workarea/admin/icons/edit.svg', class: 'text-button__icon', title: t('workarea.admin.timeline.edit'))
                           .grid__cell
                             = form_tag release_changeset_path(changeset.release, changeset), method: :delete, class: 'action-group__item', data: { deletion_form: { message: t('workarea.admin.timeline.delete_confirmation') } } do
-                              = button_tag value: 'delete_changeset', class: 'text-button' do
-                                %span= t('workarea.admin.actions.delete')
-                                = inline_svg('workarea/admin/icons/delete.svg', class: 'text-button__icon')
+                              = button_tag value: 'delete_changeset', class: 'text-button text-button--destroy' do
+                                = inline_svg('workarea/admin/icons/delete.svg', class: 'text-button__icon', title: t('workarea.admin.actions.delete'))
                     .activity__message
                       .release-changeset.release-changeset--activity
                         - changeset.changed_fields.each do |field|
                           = render_changeset_field(changeset, field)
 
-            - unless @timeline.today_has_activity
-              .activity-group.activity-group--bordered
-                .grid__cell.grid__cell--20
-                  .date-marker
-                    .date-marker__annotation= t('workarea.admin.timeline.today')
-                    .date-marker__month= local_time(Date.today, format: '%b')
-                    .date-marker__day= local_time(Date.today, format: '%e')
-                .grid__cell.grid__cell--80
-
-            - @timeline.activity_by_day.each_with_index do |(day, entries), index|
-              .activity-group.activity-group--bordered
+        - unless @timeline.activity_by_day.empty?
+          .activity-group
+            .grid
+              - @timeline.activity_by_day.each_with_index do |(day, entries), index|
                 .grid__cell.grid__cell--20
                   .date-marker
-                    -  if index == 0 && @timeline.today_has_activity
+                    - if index == 0 && @timeline.today_has_activity
                       .date-marker__annotation= t('workarea.admin.timeline.today')
                     .date-marker__month= local_time(day, format: '%b')
                     .date-marker__day= local_time(day, format: '%e')

data/app/views/workarea/admin/toolbar/show.html.haml

@@ -44,6 +44,17 @@
             - if @content.present?
               .header__action= link_to t('workarea.admin.toolbar.edit_content'), edit_content_path(@content), class: 'header__action-link'
 
+            .header__action
+              = link_to segment_override_path(return_to: params[:return_to]), title: t('workarea.admin.toolbar.select_segments'), id: 'select_segments', class: 'header__action-link' do
+                = inline_svg('workarea/admin/icons/user.svg', class: 'svg-icon svg-icon--medium svg-icon--blue') unless Rails.env.test? # Capybara cannot find this link by content, id, or title if this is present
+                - if override_segments.blank?
+                  = t('workarea.admin.toolbar.select_segments')
+                - else
+                  = override_segments.take(2).map(&:name).join(', ')
+                  - if override_segments.size > 2
+                    ,
+                    = t('workarea.admin.toolbar.more_segments', count: override_segments.size - 2)
+
             .header__action
               = form_tag release_session_path(return_to: params[:return_to]), method: :post, class: 'header__action-link' do
                 = inline_svg('workarea/admin/icons/calendar.svg', title: t('workarea.admin.toolbar.managing_changes_for'), class: 'release-select__icon')
@@ -67,7 +78,6 @@
                       = link_to current_impersonation.email, user_path(current_impersonation)
                     %br
                     = form_tag impersonations_path, method: 'delete', data: { disable_delete_confirmation: '' } do
-                      = hidden_field_tag :return_to, return_to
                       = button_tag t('workarea.admin.toolbar.stop_impersonation'), class: 'text-button text-button--destroy'
 
             - if allow_pricing_override?

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

@@ -12,7 +12,7 @@
         %p= t('workarea.admin.trash.index.description')
 
   .view__container.view__container--narrow
-    .activity-group.activity-group--bordered
+    .activity-group
       .activity-group__activities
         - @entries.each do |entry|
           = render_activity_entry(entry)

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

@@ -14,74 +14,77 @@
     = render_cards_for(@user, :attributes)
 
   .view__container.view__container--narrow
-    - @user.errors.full_messages.each do |message|
-      = render_message 'error', message
+    .section
+      - @user.errors.full_messages.each do |message|
+        = render_message 'error', message
 
     = form_tag user_path(@user), method: :patch, multipart: true, id: 'user_form', data: { unsaved_changes: '' } do
-      .grid.grid--huge
-        .grid__cell.grid__cell--50
-          .property
-            = label_tag 'user[first_name]', t('workarea.admin.fields.first_name'), class: 'property__name'
-            = text_field_tag 'user[first_name]', @user.first_name, class: 'text-box', autocomplete: 'off'
-        .grid__cell.grid__cell--50
-          .property
-            = label_tag 'user[last_name]', t('workarea.admin.fields.last_name'), class: 'property__name'
-            = text_field_tag 'user[last_name]', @user.last_name, class: 'text-box', autocomplete: 'off'
-      .property.property--required
-        = label_tag 'user[email]', t('workarea.admin.fields.email'), class: 'property__name'
-        = email_field_tag 'user[email]', @user.email, class: 'text-box', required: true, autocomplete: 'off'
-      .property
-        = label_tag 'user[password]', t('workarea.admin.fields.password'), class: 'property__name'
-        = password_field_tag 'user[password]', nil, class: 'text-box', autocomplete: 'off'
-      .property
-        = label_tag 'user[avatar]', class: 'property__name' do
-          = t('workarea.admin.fields.avatar')
-          = link_to '#user-avatar-info', data: { tooltip: '' } do
-            = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon svg-icon--small svg-icon--blue', title: t('workarea.admin.users.edit.avatar_tooltip'))
+      .section
+        .grid.grid--huge
+          .grid__cell.grid__cell--50
+            .property
+              = label_tag 'user[first_name]', t('workarea.admin.fields.first_name'), class: 'property__name'
+              = text_field_tag 'user[first_name]', @user.first_name, class: 'text-box', autocomplete: 'off'
+          .grid__cell.grid__cell--50
+            .property
+              = label_tag 'user[last_name]', t('workarea.admin.fields.last_name'), class: 'property__name'
+              = text_field_tag 'user[last_name]', @user.last_name, class: 'text-box', autocomplete: 'off'
+        .property.property--required
+          = label_tag 'user[email]', t('workarea.admin.fields.email'), class: 'property__name'
+          = email_field_tag 'user[email]', @user.email, class: 'text-box', required: true, autocomplete: 'off'
+        .property
+          = label_tag 'user[password]', t('workarea.admin.fields.password'), class: 'property__name'
+          = password_field_tag 'user[password]', nil, class: 'text-box', autocomplete: 'off'
+          %span.property__note= link_to t('workarea.admin.users.edit.send_password_reset'), send_password_reset_user_path(@user), data: { method: :post }
+        .property
+          = label_tag 'user[avatar]', class: 'property__name' do
+            = t('workarea.admin.fields.avatar')
+            = link_to '#user-avatar-info', data: { tooltip: '' } do
+              = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon svg-icon--small svg-icon--blue', title: t('workarea.admin.users.edit.avatar_tooltip'))
 
-        = avatar_for @user
-        = file_field_tag 'user[avatar]'
+          = avatar_for @user
+          = file_field_tag 'user[avatar]'
 
-        - if @user.avatar.present?
-          = check_box_tag 'remove_avatar', 1, nil
-          = label_tag 'remove_avatar', t('workarea.admin.users.edit.avatar_delete')
+          - if @user.avatar.present?
+            = check_box_tag 'remove_avatar', 1, nil
+            = label_tag 'remove_avatar', t('workarea.admin.users.edit.avatar_delete')
 
-        #user-avatar-info.tooltip-content
-          %p= t('workarea.admin.users.edit.avatar_tooltip_content')
+          #user-avatar-info.tooltip-content
+            %p= t('workarea.admin.users.edit.avatar_tooltip_content')
 
-      .property
-        = label_tag 'user[tag_list]', t('workarea.admin.fields.tags'), class: 'property__name'
-        = text_field_tag 'user[tag_list]', @user.tag_list, class: 'text-box'
-        %span.property__note= t('workarea.admin.form.csv_field_note')
+        .property
+          = label_tag 'user[tag_list]', t('workarea.admin.fields.tags'), class: 'property__name'
+          = text_field_tag 'user[tag_list]', @user.tag_list, class: 'text-box'
+          %span.property__note= t('workarea.admin.form.csv_field_note')
 
-      .grid.grid--huge
-        .grid__cell.grid__cell--50.grid__cell--25-at-medium
-          .property
-            = label_tag 'payment[store_credit]', t('workarea.admin.fields.store_credit'), class: 'property__name'
-            = currency_symbol
-            = number_field_tag 'payment[store_credit]', @user.payment_profile.store_credit, class: 'text-box text-box--small', step: 0.01, min: 0
-        .grid__cell.grid__cell--50.grid__cell--25-at-medium
-          .property
-            %span.property__name
-              = t('workarea.admin.users.edit.email_signup')
-            = toggle_button_for 'email_signup', @user.email_signup?
+        .grid.grid--huge
+          .grid__cell.grid__cell--50.grid__cell--25-at-medium
+            .property
+              = label_tag 'payment[store_credit]', t('workarea.admin.fields.store_credit'), class: 'property__name'
+              = currency_symbol
+              = number_field_tag 'payment[store_credit]', @user.payment_profile.store_credit, class: 'text-box text-box--small', step: 0.01, min: 0
+          .grid__cell.grid__cell--50.grid__cell--25-at-medium
+            .property
+              %span.property__name
+                = t('workarea.admin.users.edit.email_signup')
+              = toggle_button_for 'email_signup', @user.email_signup?
 
-      = append_partials('admin.user_properties', user: @user)
+        = append_partials('admin.user_properties', user: @user)
 
-      .grid.grid--huge
-        .grid__cell.grid__cell--50.grid__cell--25-at-medium
-          .property
-            = label_tag 'user_updated_at', t('workarea.admin.fields.updated_at'), class: 'property__name'
-            = local_time(@user.updated_at)
-        .grid__cell.grid__cell--50.grid__cell--25-at-medium
-          .property
-            = label_tag 'user_created_at', t('workarea.admin.fields.created_at'), class: 'property__name'
-            = local_time(@user.created_at)
-        - if @user.created_by.present?
+        .grid.grid--huge
+          .grid__cell.grid__cell--50.grid__cell--25-at-medium
+            .property
+              = label_tag 'user_updated_at', t('workarea.admin.fields.updated_at'), class: 'property__name'
+              = local_time(@user.updated_at)
           .grid__cell.grid__cell--50.grid__cell--25-at-medium
             .property
-              = label_tag 'user_created_by', t('workarea.admin.fields.created_by'), class: 'property__name'
-              = link_to @user.created_by.name, user_path(@user.created_by)
+              = label_tag 'user_created_at', t('workarea.admin.fields.created_at'), class: 'property__name'
+              = local_time(@user.created_at)
+          - if @user.created_by.present?
+            .grid__cell.grid__cell--50.grid__cell--25-at-medium
+              .property
+                = label_tag 'user_created_by', t('workarea.admin.fields.created_by'), class: 'property__name'
+                = link_to @user.created_by.name, user_path(@user.created_by)
 
       .workflow-bar
         .grid.grid--auto.grid--right.grid--middle

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

@@ -2,13 +2,11 @@
 
 .view
   .view__header
-    .grid.grid--right
+    .grid.grid--middle.grid--center
       .grid__cell.grid__cell--50
         .view__heading
           = link_to "↑ #{t('workarea.admin.users.index.dashboard_link')}", people_dashboards_path, class: 'view__dashboard-button'
           %h1= t('workarea.admin.users.index.title')
-      .grid__cell.grid__cell--25
-        = append_partials('admin.user_index_aux_navigation')
 
   .view__container
     .browsing-controls.browsing-controls--with-divider.browsing-controls--center{ class: ('browsing-controls--filters-displayed' unless @search.toggle_facets?) }

data/app/views/workarea/admin/users/index.json.jbuilder

@@ -2,3 +2,11 @@ json.results @results do |user|
   json.label user.name
   json.value user.id
 end
+
+json.mentions @results do |user|
+  json.id user.id
+  json.name user.name
+  json.email user.email
+  json.lookup "#{user.name} (#{user.email})"
+  json.fillAttr user.email.split('@').first
+end

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

@@ -29,7 +29,11 @@
                 %tr
                   %th
                     %span.data-pairs__name= t('workarea.admin.users.insights.average_order_value')
-                  %td= number_to_currency @user.insights.average_order_value
+                  %td
+                    - if @user.insights.average_order_value.blank?
+                      \-
+                    - else
+                      = number_to_currency @user.insights.average_order_value
                 %tr
                   %th
                     %span.data-pairs__name= t('workarea.admin.users.insights.discounts')
@@ -69,38 +73,38 @@
                   %th
                     %span.data-pairs__name= t('workarea.admin.users.insights.orders')
                   %td
-                    = @user.insights.orders_percentile.ordinalize
-                    = t('workarea.admin.users.insights.percentile')
+                    - if @user.insights.orders_percentile.blank?
+                      \-
+                    - else
+                      = @user.insights.orders_percentile.ordinalize
+                      = t('workarea.admin.users.insights.percentile')
                 %tr
                   %th
                     %span.data-pairs__name= t('workarea.admin.users.insights.revenue')
                   %td
-                    = @user.insights.revenue_percentile.ordinalize
-                    = t('workarea.admin.users.insights.percentile')
+                    - if @user.insights.revenue_percentile.blank?
+                      \-
+                    - else
+                      = @user.insights.revenue_percentile.ordinalize
+                      = t('workarea.admin.users.insights.percentile')
                 %tr
                   %th
                     %span.data-pairs__name= t('workarea.admin.users.insights.frequency')
                   %td
-                    = @user.insights.frequency_percentile.ordinalize
-                    = t('workarea.admin.users.insights.percentile')
+                    - if @user.insights.frequency_percentile.blank?
+                      \-
+                    - else
+                      = @user.insights.frequency_percentile.ordinalize
+                      = t('workarea.admin.users.insights.percentile')
                 %tr
                   %th
                     %span.data-pairs__name= t('workarea.admin.users.insights.aov')
                   %td
-                    = @user.insights.average_order_value_percentile.ordinalize
-                    = t('workarea.admin.users.insights.percentile')
-
-        .align-center
-          = link_to '#customer-insights-info', data: { tooltip: { side: 'bottom', interactive: true } } do
-            = t('workarea.admin.users.insights.customer_insights')
-          #customer-insights-info.tooltip-content.align-center
-            = t( |
-              'workarea.admin.users.insights.customer_insights_info_html', |
-              best_customers_path: insights_report_path(type: Workarea::Insights::BestCustomers), |
-              customers_at_risk_path: insights_report_path(type: Workarea::Insights::CustomersAtRisk), |
-              repeat_purchase_rate_path: insights_report_path(type: Workarea::Insights::RepeatPurchaseRate), |
-              orders_path: orders_user_path(@user) |
-            ) |
+                    - if @user.insights.average_order_value_percentile.blank?
+                      \-
+                    - else
+                      = @user.insights.average_order_value_percentile.ordinalize
+                      = t('workarea.admin.users.insights.percentile')
 
     .section
       %h2.align-center= t('workarea.admin.users.insights.recently_viewed.title')
@@ -129,8 +133,12 @@
             %p.align-center= t('workarea.admin.users.insights.recently_viewed.none')
 
           %ul
-            - @user.recent_searches.each do |search|
-              %li= link_to search, storefront.search_path(q: search)
+            - @user.recent_searches.each do |search_id|
+              %li
+                = form_tag search_customizations_path, method: 'post' do
+                  = hidden_field_tag 'q', search_id, id: nil
+                  = button_tag search_id, class: 'button button--small'
+
 
   - if @insights.any?
     .view__container.view__container--narrow

data/app/views/workarea/admin/users/permissions.html.haml

@@ -24,7 +24,7 @@
       = form_tag user_path(@user), method: :patch, id: 'user_form', data: { unsaved_changes: '' } do
         .grid.grid--center
           .grid__cell.grid__cell--33
-            %h3.align-center= t('workarea.admin.users.permissions.admin_access')
+            %h3.align-center= t('workarea.admin.users.permissions.admin_capabilities')
             .property
               = check_box :user, :admin, disabled: @user.super_admin?
               = label_tag 'user[admin]', t('workarea.admin.users.permissions.access_to_administration'), class: 'property__name'
@@ -42,6 +42,15 @@
               #can-publish-warning.tooltip-content
                 %p= t('workarea.admin.users.permissions.can_publish_now_message')
 
+            .property
+              = check_box :user, :orders_manager, disabled: @user.super_admin?
+              = label_tag 'user[orders_manager]', t('workarea.admin.users.permissions.can_manage_orders'), class: 'property__name'
+              = link_to '#can-manage-orders', data: { tooltip: '' } do
+                = inline_svg('workarea/admin/icons/help.svg', class: 'svg-icon svg-icon--small svg-icon--blue', title: t('workarea.admin.users.permissions.can_publish_now_info'))
+
+              #can-manage-orders.tooltip-content
+                %p= t('workarea.admin.users.permissions.can_manage_orders_message')
+
             .property
               = check_box :user, :can_restore, disabled: @user.super_admin?
               = label_tag 'user[can_restore]', t('workarea.admin.users.permissions.can_restore_deleted_items'), class: 'property__name'

data/app/views/workarea/admin/users/show.html.haml

@@ -11,6 +11,13 @@
         = render_aux_navigation_for(@user)
 
   .view__container
+    - if @user.login_locked?
+      .grid.grid--center
+        .grid__cell.grid__cell--75
+          = render_message 'warn' do
+            %span= t('workarea.admin.users.show.locked')
+            = link_to t('workarea.admin.users.show.unlock'), unlock_user_path(@user), data: { method: :patch }
+
     = render_cards_for(@user)
 
     .workflow-bar