workarea-admin 3.4.45 → 3.5.0.beta.1

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

@@ -1,98 +1,89 @@
-- @page_title = t('workarea.admin.releases.index.page_title')
+- @page_title = t('workarea.admin.releases.calendar.title')
 
 .view
   .view__header
-    .grid.grid--center
+    .grid.grid--middle.grid--right
       .grid__cell.grid__cell--50
         .view__heading
           = link_to "↑ #{t('workarea.admin.releases.index.dashboard_link')}", root_path
-          %h1.heading--no-margin= t('workarea.admin.releases.index.title')
+          %h1.heading.heading--no-margin= t('workarea.admin.releases.calendar.title')
+          %p
+            - if @calendar.unscheduled.any?
+              = t('workarea.admin.releases.index.there_are_unscheduled', count: @calendar.unscheduled.count)
+              = link_to t('workarea.admin.releases.index.view_all'), list_releases_path
+
+      .grid__cell.grid__cell--25
+        .grid.grid--auto.grid--right.grid--middle
+          .grid__cell= link_to t('workarea.admin.releases.index.view_all_releases'), list_releases_path
 
   .view__container
-    .browsing-controls.browsing-controls--with-divider.browsing-controls--center{ class: ('browsing-controls--filters-displayed' unless @search.toggle_facets?) }
-      = form_tag releases_path, method: 'get', id: 'release_search_form', class: 'browsing-controls__form' do
-        = facet_hidden_inputs(@search.facets)
-        .browsing-controls__sort
-          .property.property--inline
-            = label_tag 'sort', t('workarea.admin.search.sort_by'), class: 'property__name'
-            = select_tag :sort, options_for_select(@search.sorts, selected: @search.sort), data: { form_submitting_control: '' }
-
-        .browsing-controls__search
-          .search-form
-            = text_field_tag :q, params[:q], class: 'search-form__input', id: 'search_releases', title: t('workarea.admin.search.keywords'), placeholder: t('workarea.admin.search.keywords')
-            = submit_tag 'search_releases', class: 'search-form__button'
-
-        = render 'workarea/admin/shared/creation_date', search: @search, form_path: releases_path
-
-        - if @search.facets.present?
-          - @search.facets.each do |facet|
-            = render "workarea/admin/facets/#{facet.type}", facet: facet
-
-        - if @search.toggle_facets?
-          .browsing-controls__toggle-filters
-            %button.text-button{ type: 'button', data: { toggle_filters: '' } }= t('workarea.admin.search.show_filters')
-
-      = render 'workarea/admin/facets/applied', search: @search, reset_path: releases_path
-
-      %p.browsing-controls__count= pluralize(@search.total, 'release')
-
-    - if @search.results.any?
-      %table.index-table
-        %thead
-          %tr
-            %th= t('workarea.admin.fields.name')
-            %th.align-center= t('workarea.admin.fields.publishes')
-            %th.align-center= t('workarea.admin.fields.undo_at')
-            %th= t('workarea.admin.fields.last_published')
-            %th= t('workarea.admin.fields.updated_at')
-        %tbody
-          - @search.results.each do |result|
-            %tr.index-table__row{ class: ('index-table__row--inactive' unless result.upcoming?) }
-              %td
-                = link_to result.name, result
-                = comments_icon_for(result)
-              %td.align-center
-                - if result.publish_at.present?
-                  #{local_time_ago(result.publish_at)}
-                - else
-                  = t('workarea.admin.releases.index.unscheduled')
-              %td.align-center
-                - if result.undo_at.present?
-                  #{local_time_ago(result.undo_at)}
-                - else
-                  = t('workarea.admin.releases.index.unscheduled')
-              %td
-                - if result.published_at.present?
-                  = local_time_ago(result.published_at)
-                - else
-                  = t('workarea.admin.releases.index.never')
-              %td= local_time_ago(result.updated_at)
-
-    - if @search.results.total_pages > 1
-      = render 'workarea/admin/shared/pagination', collection: @search.results
-
-    .workflow-bar
-      .grid.grid--auto.grid--right
-        - calendar_feed_url = calendar_feed_releases_url(token: current_user.token, protocol: 'webcal')
-        .grid__cell= button_tag t('workarea.admin.releases.index.add_to_calendar.link_text'), class: 'workflow-bar__button', data: { add_to_calendar_button: { initial: '#calendar-tooltip', moreInfo: '#google-calendar-info' }.as_json }
-        .grid__cell= link_to t('workarea.admin.releases.index.add_new_release'), create_releases_path, id: 'add_release', class: 'workflow-bar__button workflow-bar__button--create'
-      #calendar-tooltip.tooltip-content.tooltip-content--no-padding
-        .add-to-calendar
-          %ul.add-to-calendar__list
-            %li.add-to-calendar__item
-              = link_to calendar_feed_url, class: 'grid grid--auto grid--middle grid--large', data: { add_to_calendar_button_toggle: '' } do
-                %span.grid__cell= image_tag 'workarea/admin/icons/google_calendar.svg', size: '24x24'
-                %span.grid__cell
-                  %span.add-to-calendar__link= t('workarea.admin.releases.index.add_to_calendar.tooltip.google_calendar')
-            %li.add-to-calendar__item
-              = link_to calendar_feed_url, class: 'grid grid--auto grid--middle grid--large' do
-                %span.grid__cell= image_tag 'workarea/admin/icons/apple_calendar.svg', size: '24x24'
-                %span.grid__cell
-                  %span.add-to-calendar__link= t('workarea.admin.releases.index.add_to_calendar.tooltip.apple_calendar')
-            %li.add-to-calendar__item
-              = link_to calendar_feed_url, class: 'grid grid--auto grid--middle grid--large' do
-                %span.grid__cell= image_tag 'workarea/admin/icons/outlook.svg', size: '24x24'
-                %span.grid__cell
-                  %span.add-to-calendar__link= t('workarea.admin.releases.index.add_to_calendar.tooltip.outlook')
-        .hidden
-          #google-calendar-info= t('workarea.admin.releases.index.add_to_calendar.tooltip.google_calendar_instructions_html', calendar_feed_url: calendar_feed_url)
+    .section
+      .calendar
+
+        = link_to inline_svg('workarea/admin/icons/arrow_up.svg', title: t('workarea.admin.releases.calendar.previous_week'), class: 'calendar__control-icon'), releases_path(start_date: @calendar.prev_week), class: 'calendar__control calendar__control--prev'
+
+        .calendar__today-button
+          = button_tag t('workarea.admin.releases.calendar.today'), type: 'button', class: 'button button--small', data: { calendar_today_button: '' }
+
+        %table.calendar__table
+          %thead
+            %tr
+              - @calendar.weekdays.each do |weekday|
+                %th.calendar__weekday
+                  %span.calendar__weekday-name= weekday
+
+          %tbody
+            - @calendar.days.each_slice(7).with_index do |week, i|
+              %tr
+                - week.each do |day|
+                  %td.calendar__header= month_name_needed?(day.first, @calendar.days) ?  month_and_year_from_date(day.first.to_date) : ' '.html_safe
+              %tr
+                - week.each do |day, releases|
+                  %td{ class: calendar_day_classes(day) }
+                    .calendar__day-header
+                      .calendar__day-header-cell
+                        .calendar__day-number= calendar_day_number(day)
+
+                      .calendar__day-header-cell
+                        - if current_user.can_publish_now?
+                          - if Date.parse(day).today?
+                            = link_to create_releases_path(release: { publish_at: Time.current.end_of_day - 4.minutes }), class: 'calendar__new-release' do
+                              %span.calendar__new-release-text= t('workarea.admin.releases.calendar.add_new_release')
+                              = inline_svg('workarea/admin/icons/add.svg', title: t('workarea.admin.releases.calendar.add_new_release'), class: 'calendar__new-release-icon')
+
+                          - elsif Time.zone.parse(day).future?
+                            = link_to create_releases_path(release: { publish_at: Time.parse(day) }), class: 'calendar__new-release' do
+                              %span.calendar__new-release-text= t('workarea.admin.releases.calendar.add_new_release')
+                              = inline_svg('workarea/admin/icons/add.svg', title: t('workarea.admin.releases.calendar.add_new_release'), class: 'calendar__new-release-icon')
+
+                    - if releases.size > 5
+                      - releases.take(4).each do |release|
+                        = link_to release_path(release), class: 'calendar__release', title: release.name, data: { calendar_release_id: release.id } do
+                          %span.calendar__release-text
+                            %span.calendar__release-time= local_time(release.calendar_at, '%l:%M%P')
+                            %span.calendar__release-name= release.name
+
+                      = link_to "#more-releases-#{day.to_s}", data: { tooltip: { interactive: true }.to_json }, class: 'calendar__release' do
+                        %span.calendar__release-text
+                          %strong= t('workarea.admin.releases.calendar.plus_more_releases', count: releases.size - 4)
+
+                      .tooltip-content{ id: "more-releases-#{day.to_s}" }
+                        %div{ class: calendar_day_classes(day) }
+                          .calendar__day-header
+                            %span.calendar__day-number= calendar_day_number(day)
+
+                          - releases.each do |release|
+                            = link_to release_path(release), class: 'calendar__release', title: release.name, data: { calendar_release_id: release.id } do
+                              %span.calendar__release-text
+                                %span.calendar__release-time= local_time(release.calendar_at, '%l:%M%P')
+                                %span.calendar__release-name= release.name
+
+                    - else
+                      - releases.each do |release|
+                        = link_to release_path(release), class: 'calendar__release', title: release.name, data: { calendar_release_id: release.id } do
+                          %span.calendar__release-text
+                            %span.calendar__release-time= local_time(release.calendar_at, '%l:%M%P')
+                            %span.calendar__release-name= release.name
+
+
+        = link_to inline_svg('workarea/admin/icons/arrow_down.svg', title: t('workarea.admin.releases.calendar.next_week'), class: 'calendar__control-icon'), releases_path(start_date: @calendar.next_week), class: 'calendar__control calendar__control--next'

data/app/views/workarea/admin/releases/list.html.haml

@@ -0,0 +1,107 @@
+- @page_title = t('workarea.admin.releases.index.page_title')
+
+.view
+  .view__header
+    .grid.grid--center
+      .grid__cell.grid__cell--50
+        .view__heading
+          = link_to "↑ #{t('workarea.admin.releases.index.index_link')}", releases_path
+          %h1.heading--no-margin= t('workarea.admin.releases.index.title')
+
+  .view__container
+    .browsing-controls.browsing-controls--with-divider.browsing-controls--center{ class: ('browsing-controls--filters-displayed' unless @search.toggle_facets?) }
+      = form_tag list_releases_path, method: 'get', id: 'release_search_form', class: 'browsing-controls__form' do
+        = facet_hidden_inputs(@search.facets)
+        .browsing-controls__sort
+          .property.property--inline
+            = label_tag 'sort', t('workarea.admin.search.sort_by'), class: 'property__name'
+            = select_tag :sort, options_for_select(@search.sorts, selected: @search.sort), data: { form_submitting_control: '' }
+
+        .browsing-controls__search
+          .search-form
+            = text_field_tag :q, params[:q], class: 'search-form__input', id: 'search_releases', title: t('workarea.admin.search.keywords'), placeholder: t('workarea.admin.search.keywords')
+            = submit_tag 'search_releases', class: 'search-form__button'
+
+        = render 'workarea/admin/shared/creation_date', search: @search, form_path: releases_path
+
+        - if @search.facets.present?
+          - @search.facets.each do |facet|
+            = render "workarea/admin/facets/#{facet.type}", facet: facet
+
+        - if @search.toggle_facets?
+          .browsing-controls__toggle-filters
+            %button.text-button{ type: 'button', data: { toggle_filters: '' } }= t('workarea.admin.search.show_filters')
+
+      = render 'workarea/admin/facets/applied', search: @search, reset_path: releases_path
+
+      %p.browsing-controls__count{ data: { browsing_controls_count: @search.total } }
+        = pluralize(@search.total, 'release')
+
+    - if @search.results.any?
+      %table.index-table
+        %thead
+          %tr
+            %th.index-table__control-cell
+              .checkbox
+                = check_box_tag 'select_all', nil, false, id: 'select_all', class: 'checkbox__input', data: { bulk_action_select_all: '' }
+                = label_tag 'select_all', t('workarea.admin.bulk_actions.select_all'), class: 'checkbox__label'
+            %th= t('workarea.admin.fields.name')
+            %th.align-center= t('workarea.admin.fields.publishes')
+            %th.align-center= t('workarea.admin.fields.changes')
+            %th= t('workarea.admin.fields.last_published')
+            %th= t('workarea.admin.fields.updated_at')
+        %tbody
+          - @search.results.each do |result|
+            %tr.index-table__row{ class: ('index-table__row--inactive' unless result.upcoming?) }
+              %td.index-table__control-cell
+                .checkbox
+                  = check_box_tag 'global_id', result.to_gid_param, false, class: 'checkbox__input', id: dom_id(result), data: { bulk_action_item: '' }
+                  = label_tag dom_id(result), '', class: 'checkbox__label', title: t('workarea.admin.bulk_actions.add_summary_button')
+              %td
+                = link_to result.name, result
+                = comments_icon_for(result)
+              %td.align-center
+                - if result.publish_at.present?
+                  #{local_time_ago(result.publish_at)}
+                - else
+                  = t('workarea.admin.releases.index.unscheduled')
+              %td.align-center= result.changesets_with_releasable.count || 0
+              %td
+                - if result.published_at.present?
+                  = local_time_ago(result.published_at)
+                - else
+                  = t('workarea.admin.releases.index.never')
+              %td= local_time_ago(result.updated_at)
+
+    - if @search.results.total_pages > 1
+      = render 'workarea/admin/shared/pagination', collection: @search.results
+
+    .workflow-bar
+      .grid
+        .grid__cell.grid__cell--80
+          = render 'workarea/admin/shared/bulk_actions', klass: Workarea::Release, search: @search, import: false, export: false
+        .grid__cell.grid__cell--20
+          .grid.grid--auto.grid--right
+            - calendar_feed_url = calendar_feed_releases_url(token: current_user.token, protocol: 'webcal')
+            .grid__cell= button_tag t('workarea.admin.releases.index.add_to_calendar.link_text'), class: 'workflow-bar__button', data: { add_to_calendar_button: { initial: '#calendar-tooltip', moreInfo: '#google-calendar-info' }.as_json }
+            .grid__cell= link_to t('workarea.admin.releases.index.add_new_release'), create_releases_path, id: 'add_release', class: 'workflow-bar__button workflow-bar__button--create'
+          #calendar-tooltip.tooltip-content.tooltip-content--no-padding
+            .add-to-calendar
+              %ul.add-to-calendar__list
+                %li.add-to-calendar__item
+                  = link_to calendar_feed_url, class: 'grid grid--auto grid--middle grid--large', data: { add_to_calendar_button_toggle: '' } do
+                    %span.grid__cell= image_tag 'workarea/admin/icons/google_calendar.svg', size: '24x24'
+                    %span.grid__cell
+                      %span.add-to-calendar__link= t('workarea.admin.releases.index.add_to_calendar.tooltip.google_calendar')
+                %li.add-to-calendar__item
+                  = link_to calendar_feed_url, class: 'grid grid--auto grid--middle grid--large' do
+                    %span.grid__cell= image_tag 'workarea/admin/icons/apple_calendar.svg', size: '24x24'
+                    %span.grid__cell
+                      %span.add-to-calendar__link= t('workarea.admin.releases.index.add_to_calendar.tooltip.apple_calendar')
+                %li.add-to-calendar__item
+                  = link_to calendar_feed_url, class: 'grid grid--auto grid--middle grid--large' do
+                    %span.grid__cell= image_tag 'workarea/admin/icons/outlook.svg', size: '24x24'
+                    %span.grid__cell
+                      %span.add-to-calendar__link= t('workarea.admin.releases.index.add_to_calendar.tooltip.outlook')
+            .hidden
+              #google-calendar-info= t('workarea.admin.releases.index.add_to_calendar.tooltip.google_calendar_instructions_html', calendar_feed_url: calendar_feed_url)

data/app/views/workarea/admin/releases/original.html.haml

@@ -0,0 +1,50 @@
+- @page_title = t('workarea.admin.releases.original.page_title', name: @release.name)
+
+.view
+  .view__header
+    .grid.grid--middle.grid--right
+      .grid__cell.grid__cell--50
+        .view__heading
+          = link_to "↑ #{t('workarea.admin.releases.original.index_link')}", releases_path
+          %h1= link_to @release.name, url_for(@release)
+      .grid__cell.grid__cell--25
+        = render_aux_navigation_for(@release)
+
+  .view__container
+    = render_cards_for(@release, :original)
+
+  .view__container.view__container--narrow
+    .section
+      .grid.grid--center
+        .grid__cell.grid__cell--25
+          %p.text.text--large= t('workarea.admin.releases.original.created_description_html', undo: link_to(@release.name, @release), original: link_to(@release.undoes.name, @release.undoes), at: local_time_ago(@release.created_at))
+        .grid__cell.grid__cell--25.align-center
+          .card{ class: card_classes(:planned_changes) }
+            = link_to @release.undoes, class: 'card__header' do
+              %span.card__header-text= @release.undoes.name
+              = inline_svg 'workarea/admin/icons/planned_changes.svg', class: 'card__icon'
+
+            .card__body
+              - if @release.undoes.changesets_with_releasable.empty?
+                %p.card__empty-note= t('workarea.admin.releases.original.no_changes_for_this_release')
+              - else
+                - @release.undoes.changesets_with_releasable.take(3).each do |changeset|
+                  .activity
+                    .activity__header
+                      .activity__avatar
+                        = changeset_icon changeset, { class: 'svg-icon'}
+                      .activity__name= changeset.release.name
+                      .activity__time
+                        = changeset.publish_humanized
+                        - if changeset.release_date.present?
+                          = local_time(changeset.release_date, :long)
+                    .activity__message
+                      .release-changeset.release-changeset--activity
+                        .release-changeset__body
+                          - changeset.changed_fields.each do |field|
+                            = render_changeset_field(changeset, field)
+
+                = link_to @release.undoes, class: 'card__button' do
+                  %span.button.button--small= t('workarea.admin.releases.original.view_the_original_release')
+
+

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

@@ -21,7 +21,7 @@
           .grid.grid--auto.grid--right
             - if !@release.has_changes?
               .grid__cell
-                = link_to t('workarea.admin.releases.show.start_preview_in_storefront'), '#no-changes-to-preview-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update'
+                = link_to t('workarea.admin.releases.show.visit_storefront_to_preview'), '#no-changes-to-preview-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update'
                 #no-changes-to-preview-info.tooltip-content
                   %p= t('workarea.admin.releases.show.no_changes_to_preview')
 
@@ -30,11 +30,6 @@
                 #no-changes-to-publish-info.tooltip-content
                   %p= t('workarea.admin.releases.show.no_changes_to_publish')
 
-              .grid__cell
-                = link_to t('workarea.admin.releases.show.undo'), '#no-changes-to-undo-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update'
-                #no-changes-to-undo-info.tooltip-content
-                  %p= t('workarea.admin.releases.show.no_changes_to_undo')
-
             - else
               .grid__cell
                 - if current_release.try(:id) == @release.id
@@ -43,23 +38,14 @@
                   = form_tag release_session_path, method: :post do
                     = hidden_field_tag :release_id, @release.id
                     = hidden_field_tag :return_to, storefront.root_path
-                    = button_tag t('workarea.admin.releases.show.start_preview_in_storefront'), value: 'browse', class: 'workflow-bar__button workflow-bar__button--update'
+                    = button_tag t('workarea.admin.releases.show.visit_storefront_to_preview'), value: 'browse', class: 'workflow-bar__button workflow-bar__button--update'
 
               .grid__cell
                 - publish_text = @release.published? ? t('workarea.admin.releases.show.republish_now') : t('workarea.admin.releases.show.publish_now')
                 - if current_user.can_publish_now?
-                  = form_tag publish_release_path(@release), method: :patch, class: 'grid__cell' do
+                  = form_tag publish_release_path(@release), method: :patch do
                     = button_tag publish_text, value: 'publish', class: 'workflow-bar__button workflow-bar__button--update'
                 - else
                   = link_to publish_text, '#cannot-publish-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update'
                   #cannot-publish-info.tooltip-content
                     %p= t('workarea.admin.releases.show.user_cannot_publish_info')
-
-              .grid__cell
-                - if @release.can_undo? && current_user.can_publish_now?
-                  = form_tag undo_release_path(@release), method: :patch do
-                    = button_tag t('workarea.admin.releases.show.undo'), value: 'undo', class: 'workflow-bar__button workflow-bar__button--update'
-                - else
-                  = link_to t('workarea.admin.releases.show.undo'), '#cannot-undo-info', disabled: 'disabled', data: { tooltip: '' }, class: 'workflow-bar__button workflow-bar__button--update'
-                  #cannot-undo-info.tooltip-content
-                    %p= !@release.can_undo? ? t('workarea.admin.releases.show.cannot_undo_info') : t('workarea.admin.releases.show.user_cannot_undo_info')

data/app/views/workarea/admin/releases/undo.html.haml

@@ -0,0 +1,64 @@
+- @page_title = t('workarea.admin.releases.undo.page_title', name: @release.name)
+
+.view
+  .view__header
+    .grid.grid--middle.grid--right
+      .grid__cell.grid__cell--50
+        .view__heading
+          = link_to "↑ #{t('workarea.admin.releases.undo.index_link')}", releases_path
+          %h1= link_to @release.name, url_for(@release)
+      .grid__cell.grid__cell--25
+        = render_aux_navigation_for(@release)
+
+  .view__container
+    = render_cards_for(@release, :undo)
+
+  .view__container.view__container--narrow
+    .section
+      - if @release.changesets_with_releasable.empty?
+        .grid.grid--center
+          .grid__cell.grid__cell--50
+            %h2.align-center= t('workarea.admin.releases.undo.undoing')
+            %p.align-center= t('workarea.admin.releases.undo.no_changes_html', plan_changes: link_to(t('workarea.releases.undo.plan_changes'), release_releasables_path(@release)))
+
+      - elsif @release.undo.blank?
+        .grid.grid--center
+          .grid__cell.grid__cell--50
+            %h2.align-center= t('workarea.admin.releases.undo.undoing')
+            %p.align-center= t('workarea.admin.releases.undo.description')
+            %p.align-center= link_to "#{t('workarea.admin.releases.undo.build_an_undo_now')} →", new_release_undo_path(@release), class: 'button'
+      - else
+        .grid.grid--center
+          .grid__cell.grid__cell--25
+            %p.text.text--large= t('workarea.admin.releases.undo.created_description_html', undo: link_to(@release.undo.name, @release.undo), original: link_to(@release.name, @release), at: local_time_ago(@release.created_at))
+          .grid__cell.grid__cell--25.align-center
+            .card{ class: card_classes(:planned_changes) }
+              = link_to @release.undo, class: 'card__header' do
+                %span.card__header-text= @release.undo.name
+                = inline_svg 'workarea/admin/icons/planned_changes.svg', class: 'card__icon'
+
+              .card__body
+                - if @release.undo.changesets_with_releasable.empty?
+                  %p.card__empty-note= t('workarea.admin.releases.undo.no_changes_for_this_release')
+                - else
+                  - @release.undo.changesets_with_releasable.take(3).each do |changeset|
+                    .activity
+                      .activity__header
+                        .activity__avatar
+                          = changeset_icon changeset, { class: 'svg-icon'}
+                        .activity__name= changeset.release.name
+                        .activity__time
+                          = changeset.publish_humanized
+                          - if changeset.release_date.present?
+                            = local_time(changeset.release_date, :long)
+                      .activity__message
+                        .release-changeset.release-changeset--activity
+                          .release-changeset__body
+                            - changeset.changed_fields.each do |field|
+                              = render_changeset_field(changeset, field)
+
+                  = link_to @release.undo, class: 'card__button' do
+                    %span.button.button--small= t('workarea.admin.releases.undo.view_the_undo_release')
+
+
+

data/app/views/workarea/admin/reports/average_order_value.html.haml

@@ -14,7 +14,7 @@
           .grid__cell= render 'workarea/admin/shared/date_selector', starts_at: @report.starts_at, ends_at: @report.ends_at
           .grid__cell
             .property.property--inline
-              = label_tag 'group_by', t('workarea.admin.reports.first_time_vs_returning_sales.by')
+              = label_tag 'group_by', t('workarea.admin.reports.by')
               = select_tag 'group_by', options_for_select(@report.group_by_options, @report.group_by), data: { form_submitting_control: '' }
 
       .browsing-controls__count

data/app/views/workarea/admin/reports/customers.html.haml

@@ -27,7 +27,9 @@
           %th.align-center= link_to_reports_sorting t('workarea.admin.fields.first_order_at'), report: @report, sort_by: 'first_order_at'
           %th.align-center= link_to_reports_sorting t('workarea.admin.fields.last_order_at'), report: @report, sort_by: 'last_order_at'
           %th.align-center= link_to_reports_sorting t('workarea.admin.fields.orders'), report: @report, sort_by: 'orders'
+          %th.align-right= link_to_reports_sorting t('workarea.admin.fields.cancellations'), report: @report, sort_by: 'cancellations'
           %th.align-right= link_to_reports_sorting t('workarea.admin.fields.average_order_value'), report: @report, sort_by: 'average_order_value'
+          %th.align-right= link_to_reports_sorting t('workarea.admin.fields.refund'), report: @report, sort_by: 'refund'
           %th.align-right= link_to_reports_sorting t('workarea.admin.fields.revenue'), report: @report, sort_by: 'revenue'
       %tbody
         - @report.results.each do |result|
@@ -45,5 +47,7 @@
             %td.align-center= local_time_ago(result.first_order_at)
             %td.align-center= local_time_ago(result.last_order_at)
             %td.align-center= number_with_delimiter result.orders
+            %td.align-center= number_with_delimiter result.cancellations
             %td.align-right= number_to_currency(result.average_order_value)
+            %td.align-right= number_to_currency(result.refund)
             %td.align-right= number_to_currency(result.revenue)

data/app/views/workarea/admin/reports/first_time_vs_returning_sales.html.haml

@@ -14,7 +14,7 @@
           .grid__cell= render 'workarea/admin/shared/date_selector', starts_at: @report.starts_at, ends_at: @report.ends_at
           .grid__cell
             .property.property--inline
-              = label_tag 'group_by', t('workarea.admin.reports.first_time_vs_returning_sales.by')
+              = label_tag 'group_by', t('workarea.admin.reports.by')
               = select_tag 'group_by', options_for_select(@report.group_by_options, @report.group_by), data: { form_submitting_control: '' }
 
       .browsing-controls__count

data/app/views/workarea/admin/reports/reference.html.haml

@@ -9,80 +9,39 @@
 
   .view__container.view__container--narrow
     .section
-      %h2.align-center= t('workarea.admin.reports.reference.terms')
+      %h2.align-center= t('workarea.admin.reports.reference.terms_title')
 
       %table
-        %tr
-          %td
-            %strong= t('workarea.admin.reports.reference.average_order_value')
-          %td= t('workarea.admin.reports.reference.average_order_value_description')
-        %tr
-          %td
-            %strong= t('workarea.admin.reports.reference.discounts')
-          %td= t('workarea.admin.reports.reference.discounts_description')
-        %tr
-          %td
-            %strong= t('workarea.admin.reports.reference.first_time_orders')
-          %td= t('workarea.admin.reports.reference.first_time_orders_description')
-        %tr
-          %td
-            %strong= t('workarea.admin.reports.reference.merchandise')
-          %td= t('workarea.admin.reports.reference.merchandise_description')
-        %tr
-          %td
-            %strong= t('workarea.admin.reports.reference.orders')
-          %td= t('workarea.admin.reports.reference.orders_description')
-        %tr
-          %td
-            %strong= t('workarea.admin.reports.reference.returning_orders')
-          %td= t('workarea.admin.reports.reference.returning_orders_description')
-        %tr
-          %td
-            %strong= t('workarea.admin.reports.reference.revenue')
-          %td= t('workarea.admin.reports.reference.revenue_description')
-        %tr
-          %td
-            %strong= t('workarea.admin.reports.reference.search_id')
-          %td= t('workarea.admin.reports.reference.search_id_description')
-        %tr
-          %td
-            %strong= t('workarea.admin.reports.reference.searches')
-          %td= t('workarea.admin.reports.reference.searches_description')
-        %tr
-          %td
-            %strong= t('workarea.admin.reports.reference.shipping')
-          %td= t('workarea.admin.reports.reference.shipping_description')
-        %tr
-          %td
-            %strong= t('workarea.admin.reports.reference.tax')
-          %td= t('workarea.admin.reports.reference.tax_description')
-        %tr
-          %td
-            %strong= t('workarea.admin.reports.reference.units_sold')
-          %td= t('workarea.admin.reports.reference.units_sold_description')
+        - @terms.each do |term|
+          %tr
+            %td
+              %strong= term.name
+            %td= term.description.presence || term.description_html
 
     .section
-      %h2.align-center= t('workarea.admin.reports.reference.discrepancies')
+      %h2.align-center= t('workarea.admin.reports.reference.discrepancies_title')
       %p.align-center= t('workarea.admin.reports.reference.discrepancies_description')
 
       %table
         %tr
           %td
-            %strong= t('workarea.admin.reports.reference.definitions')
-          %td= t('workarea.admin.reports.reference.definitions_description')
+            %strong= t('workarea.admin.reports.reference.discrepancies.definitions.name')
+          %td= t('workarea.admin.reports.reference.discrepancies.definitions.description')
         %tr
           %td
-            %strong= t('workarea.admin.reports.reference.browser_configuration')
-          %td= t('workarea.admin.reports.reference.browser_configuration_description')
+            %strong= t('workarea.admin.reports.reference.discrepancies.browser_configuration.name')
+          %td= t('workarea.admin.reports.reference.discrepancies.browser_configuration.description')
         %tr
           %td
-            %strong= t('workarea.admin.reports.reference.time_zones')
-          %td= t('workarea.admin.reports.reference.time_zones_description_html', time_zone: Time.zone.name)
+            %strong= t('workarea.admin.reports.reference.discrepancies.time_zones.name')
+          %td= t('workarea.admin.reports.reference.discrepancies.time_zones.description_html', time_zone: Time.zone.name)
         %tr
           %td
-            %strong= t('workarea.admin.reports.reference.time_delay')
-          %td= t('workarea.admin.reports.reference.time_delay_description_html')
+            %strong= t('workarea.admin.reports.reference.discrepancies.time_delay.name')
+          %td= t('workarea.admin.reports.reference.discrepancies.time_delay.description_html')
+
+        = append_partials('admin.report_reference_discrepancies')
 
     .section
-      %h2.align-center= t('workarea.admin.reports.reference.insights')
-      %p.align-center= t('workarea.admin.reports.reference.insights_description')
+      %h2.align-center= t('workarea.admin.reports.reference.discrepancies.insights.name')
+      %p.align-center= t('workarea.admin.reports.reference.discrepancies.insights.description')

data/app/views/workarea/admin/reports/sales_by_country.html.haml

@@ -22,11 +22,14 @@
           %th= t('workarea.admin.fields.country')
           %th= t('workarea.admin.fields.name')
           %th.align-center= link_to_reports_sorting t('workarea.admin.fields.units_sold'), report: @report, sort_by: 'units_sold'
+          %th.align-center= link_to_reports_sorting t('workarea.admin.fields.units_canceled'), report: @report, sort_by: 'units_canceled'
           %th.align-center= link_to_reports_sorting t('workarea.admin.fields.orders'), report: @report, sort_by: 'orders'
+          %th.align-center= link_to_reports_sorting t('workarea.admin.fields.cancellations'), report: @report, sort_by: 'cancellations'
           %th.align-right= link_to_reports_sorting t('workarea.admin.fields.merchandise'), report: @report, sort_by: 'merchandise'
           %th.align-right= link_to_reports_sorting t('workarea.admin.fields.shipping'), report: @report, sort_by: 'shipping'
           %th.align-right= link_to_reports_sorting t('workarea.admin.fields.discounts'), report: @report, sort_by: 'discounts'
           %th.align-right= link_to_reports_sorting t('workarea.admin.fields.tax'), report: @report, sort_by: 'tax'
+          %th.align-right= link_to_reports_sorting t('workarea.admin.fields.refund'), report: @report, sort_by: 'refund'
           %th.align-right= link_to_reports_sorting t('workarea.admin.fields.revenue'), report: @report, sort_by: 'revenue'
       %tbody
         - @report.results.each do |result|
@@ -34,9 +37,12 @@
             %td= result._id
             %td= result.name.presence || t('workarea.admin.reports.unknown')
             %td.align-center= number_with_delimiter result.units_sold
+            %td.align-center= number_with_delimiter result.units_canceled
             %td.align-center= number_with_delimiter result.orders
+            %td.align-center= number_with_delimiter result.cancellations
             %td.align-right= number_to_currency(result.merchandise)
             %td.align-right= number_to_currency(result.shipping)
             %td.align-right= number_to_currency(result.discounts)
             %td.align-right= number_to_currency(result.tax)
+            %td.align-right= number_to_currency(result.refund)
             %td.align-right= number_to_currency(result.revenue)