spree_backend 4.2.4 → 4.3.0.rc3

data/app/views/spree/admin/promotion_categories/index.html.erb

@@ -20,9 +20,11 @@
         <tr>
           <td><%= promotion_category.name %></td>
           <td><%= promotion_category.code %></td>
-          <td class="actions actions-2 text-right">
-            <%= link_to_edit promotion_category, no_text: true if can?(:edit, promotion_category) %>
-            <%= link_to_delete promotion_category, no_text: true if can?(:delete, promotion_category) %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit promotion_category, no_text: true if can?(:edit, promotion_category) %>
+              <%= link_to_delete promotion_category, no_text: true if can?(:delete, promotion_category) %>
+            </span>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/promotions/_form.html.erb

@@ -45,6 +45,13 @@
       <%= f.label :promotion_category %>
       <%= f.collection_select(:promotion_category_id, @promotion_categories, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2 w-100' }) %>
     <% end %>
+
+    <% if @stores.count > 1 %>
+      <%= f.field_container :stores, class: ['form-group'] do %>
+        <%= f.label :promotion_stores, Spree.t(:stores) %>
+        <%= collection_select(:promotion, :store_ids, @stores, :id, :unique_name, {}, { multiple: true, class: 'select2' }) %>
+      <% end %>
+    <% end %>
   </div>
 
   <div id="expiry_fields" class="col-12 col-lg-4">

data/app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb

@@ -14,6 +14,7 @@
           <%= label_tag field_name, Spree.t(key.to_s) %>
           <%= preference_field_tag(field_name,
                                    promotion_action.calculator.get_preference(key),
+                                   key: key,
                                    type: promotion_action.calculator.preference_type(key)) %>
         <% end %>
         <%= hidden_field_tag "#{param_prefix}[calculator_attributes][id]", promotion_action.calculator.id %>

data/app/views/spree/admin/promotions/calculators/_default_fields.html.erb

@@ -5,6 +5,7 @@
     <%= preference_field_tag(
       field_name,
       calculator.get_preference(key),
-      type: calculator.preference_type(key)) %>
+      type: calculator.preference_type(key),
+      key: key) %>
   </div>
 <% end %>

data/app/views/spree/admin/promotions/index.html.erb

@@ -42,43 +42,42 @@
   </div>
 <% end %>
 
-<%= paginate @promotions, theme: 'admin-twitter-bootstrap-4' %>
-
 <% if @promotions.any? %>
-<div class="table-responsive">
-  <table class="table">
-    <thead>
-      <tr>
-        <th><%= Spree.t(:name) %></th>
-        <th><%= Spree.t(:code) %></th>
-        <th><%= Spree.t(:description) %></th>
-        <th><%= Spree.t(:usage_limit) %></th>
-        <th><%= Spree.t(:promotion_uses) %></th>
-        <th><%= Spree.t(:expiration) %></th>
-        <th data-hook="admin_promotions_index_header_actions" class="actions"></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @promotions.each do |promotion| %>
-        <tr id="<%= spree_dom_id promotion %>">
-          <td><%= link_to promotion.name, edit_admin_promotion_path(promotion) %></td>
-          <td><%= promotion.code %></td>
-          <td><%= promotion.description %></td>
-          <td><%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit %></td>
-          <td><%= Spree.t(:current_promotion_usage, count: promotion.credits_count) %></td>
-          <td><%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %></td>
-          <td class="actions" data-hook="admin_promotions_index_row_actions">
-            <span class="d-flex justify-content-end">
-             <%= link_to_edit promotion, no_text: true if can?(:edit, promotion) %>
-             <%= link_to_clone_promotion promotion, no_text: true if can?(:clone, promotion) %>
-             <%= link_to_delete promotion, no_text: true if can?(:delete, promotion) %>
-            </span>
-          </td>
+  <div class="table-responsive">
+    <table class="table">
+      <thead>
+        <tr>
+          <th><%= Spree.t(:name) %></th>
+          <th><%= Spree.t(:code) %></th>
+          <th><%= Spree.t(:description) %></th>
+          <th><%= Spree.t(:usage_limit) %></th>
+          <th><%= Spree.t(:promotion_uses) %></th>
+          <th><%= Spree.t(:expiration) %></th>
+          <th data-hook="admin_promotions_index_header_actions" class="actions"></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
+      </thead>
+      <tbody>
+        <% @promotions.each do |promotion| %>
+          <tr id="<%= spree_dom_id promotion %>">
+            <td><%= link_to promotion.name, spree.edit_admin_promotion_path(promotion) %></td>
+            <td><%= promotion.code %></td>
+            <td><%= promotion.description %></td>
+            <td><%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit %></td>
+            <td><%= Spree.t(:current_promotion_usage, count: promotion.credits_count) %></td>
+            <td><%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %></td>
+            <td class="actions" data-hook="admin_promotions_index_row_actions">
+              <span class="d-flex justify-content-end">
+               <%= link_to_edit promotion, no_text: true if can?(:edit, promotion) %>
+               <%= link_to_clone_promotion promotion, no_text: true if can?(:clone, promotion) %>
+               <%= link_to_delete promotion, no_text: true if can?(:delete, promotion) %>
+              </span>
+            </td>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
   </div>
+  <%= render 'spree/admin/shared/index_table_options', collection: @promotions, simple: true %>
 <% else %>
   <div class="alert alert-info no-objects-found">
     <%= Spree.t(:no_resource_found, resource: plural_resource_name(Spree::Promotion)) %>,

data/app/views/spree/admin/properties/_form.html.erb

@@ -13,4 +13,10 @@
       <%= f.error_message_on :presentation %>
     <% end %>
   </div>
+  <div class="col-12 col-md-6">
+    <%= f.field_container :filterable, class: ['form-group'] do %>
+      <%= f.label :filterable, Spree.t(:filterable) %>
+      <%= f.check_box :filterable %>
+    <% end %>
+  </div>
 </div>

data/app/views/spree/admin/properties/index.html.erb

@@ -28,6 +28,16 @@
         </div>
       </div>
 
+      <div class="row">
+        <div class="col-12 col-lg-6">
+          <div class="form-group">
+            <%= label_tag :q_filterable_eq, Spree.t(:filterable_status) %>
+            <%= f.select :filterable_eq, options_for_select([[Spree.t(:filterable), true], [Spree.t(:non_filterable), false]]), { include_blank: true }, class: 'select2-clear js-filterable' %>
+          </div>
+        </div>
+      </div>
+    </div>
+
       <div class="form-actions" data-hook="admin_pproperties_index_search_buttons">
         <%= button Spree.t(:search), 'search.svg' %>
       </div>
@@ -43,6 +53,8 @@
       <tr data-hook="listing_properties_header">
         <th><%= Spree.t(:name) %></th>
         <th><%= Spree.t(:presentation) %></th>
+        <th><%= Spree.t(:filterable) %></th>
+        <th><%= Spree.t(:filter_param) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
@@ -51,9 +63,13 @@
         <tr id="<%= spree_dom_id property %>" data-hook="listing_properties_row">
           <td><%= property.name %></td>
           <td><%= property.presentation %></td>
-          <td class="actions actions-2 text-right">
-            <%= link_to_edit(property, no_text: true) if can?(:edit, property) %>
-            <%= link_to_delete(property, no_text: true) if can?(:delete, property) %>
+          <td><%= active_badge(property.filterable) %></td>
+          <td><%= property.filter_param %></td>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit(property, no_text: true) if can?(:edit, property) %>
+              <%= link_to_delete(property, no_text: true) if can?(:delete, property) %>
+            </span>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/prototypes/_form.html.erb

@@ -22,7 +22,7 @@
   <div id='taxons' data-hook>
     <%= f.field_container :taxon_ids, class: ['form-group'] do %>
       <%= f.label :taxon_ids, Spree.t(:taxons) %><br>
-      <%= f.select :taxon_ids, Spree::Taxon.all.map { |t| [t.name, t.id] }, {}, { multiple: true, class: "select2" } %>
+      <%= f.select :taxon_ids, current_store.taxons.pluck(:name, :id), {}, { multiple: true, class: "select2" } %>
     <% end %>
   </div>
 </div>

data/app/views/spree/admin/prototypes/_prototypes.html.erb

@@ -10,12 +10,14 @@
       <% @prototypes.each do |prototype| %>
         <tr id="row_<%= prototype.id %>" data-hook="available_row">
           <td><%= prototype.name %></td>
-          <td class="actions actions-1">
-            <%= link_to_with_icon 'save.svg',
-              Spree.t(:select),
-              select_admin_prototype_url(prototype),
-              class: 'btn btn-success btn-sm ajax select_properties_from_prototype',
-              no_text: true %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_with_icon 'save.svg',
+                Spree.t(:select),
+                select_admin_prototype_url(prototype),
+                class: 'btn btn-success btn-sm ajax select_properties_from_prototype',
+                no_text: true %>
+            </span>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/prototypes/index.html.erb

@@ -19,9 +19,11 @@
         <% @prototypes.each do |prototype| %>
           <tr id="<%= spree_dom_id prototype %>" data-hook="prototypes_row">
             <td><%= prototype.name %></td>
-            <td class="actions actions-2 text-right">
-              <%= link_to_edit(prototype, no_text: true, class: 'admin_edit_prototype') if can?(:edit, prototype) %>
-              <%= link_to_delete(prototype, no_text: true) if can?(:delete, prototype) %>
+            <td class="actions">
+              <span class="d-flex justify-content-end">
+                <%= link_to_edit(prototype, no_text: true, class: 'admin_edit_prototype') if can?(:edit, prototype) %>
+                <%= link_to_delete(prototype, no_text: true) if can?(:delete, prototype) %>
+              </span>
             </td>
           </tr>
         <% end %>

data/app/views/spree/admin/reimbursement_types/index.html.erb

@@ -25,9 +25,11 @@
           <td>
             <%= reimbursement_type.type.split('::', 3).last %>
           </td>
-          <td class="actions actions-2 text-right">
-            <%= link_to_edit reimbursement_type, no_text: true, class: 'edit' if can?(:edit, reimbursement_type) %>
-            <%= link_to_delete reimbursement_type, no_text: true if can?(:delete, reimbursement_type) %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit reimbursement_type, no_text: true, class: 'edit' if can?(:edit, reimbursement_type) %>
+              <%= link_to_delete reimbursement_type, no_text: true if can?(:delete, reimbursement_type) %>
+            </span>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/reports/index.html.erb

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= Spree.t(:reports) %>
+  <%= Spree.t(:reports) %> <%= Spree.t('admin.reports.for', store_name: current_store.unique_name) %>
 <% end %>
 <div class="table-responsive">
   <table class="table">

data/app/views/spree/admin/reports/sales_total.html.erb

@@ -1,6 +1,6 @@
 <% content_for :page_title do %>
   <%= link_to Spree.t(:reports), spree.admin_reports_url %> /
-  <%= Spree.t(:sales_totals) %>
+  <%= Spree.t(:sales_totals) %> <%= Spree.t('admin.reports.for', store_name: current_store.unique_name) %>
 <% end %>
 
 <div class="card bg-light mb-3">

data/app/views/spree/admin/return_authorizations/_form.html.erb

@@ -14,8 +14,8 @@
         <th><%= Spree.t(:status) %></th>
         <th><%= Spree.t(:charged) %></th>
         <th><%= Spree.t(:purchased_quantity) %></th>
-        <th><%= Spree.t(:return_quantity) %></th>
-        <th><%= Spree.t(:pre_tax_refund_amount) %></th>
+        <th style="min-width:130px;"><%= Spree.t(:return_quantity) %></th>
+        <th style="min-width:150px;"><%= Spree.t(:pre_tax_refund_amount) %></th>
         <th><%= Spree.t(:reimbursement_type) %></th>
         <th><%= Spree.t(:exchange_for) %></th>
       </tr>

data/app/views/spree/admin/return_authorizations/index.html.erb

@@ -33,11 +33,13 @@
           </td>
           <td><%= return_authorization.display_pre_tax_total.to_html %></td>
           <td><%= pretty_time(return_authorization.created_at) %></td>
-          <td class="actions actions-2">
-            <%= link_to_edit(return_authorization, no_text: true, class: 'edit') if can?(:edit, return_authorization) %>
-            <% if can?(:delete, return_authorization) && !return_authorization.customer_returned_items? %>
-              <%= link_to_delete return_authorization, no_text: true %>
-            <% end %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit(return_authorization, no_text: true, class: 'edit') if can?(:edit, return_authorization) %>
+              <% if can?(:delete, return_authorization) && !return_authorization.customer_returned_items? %>
+                <%= link_to_delete return_authorization, no_text: true %>
+              <% end %>
+            </span>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/return_index/customer_returns.html.erb

@@ -47,8 +47,10 @@
             <% end %>
           </td>
           <td><%= customer_return.display_pre_tax_total.to_html %></td>
-          <td class="actions actions-1 text-right">
-            <%= link_to_edit_url spree.edit_admin_order_customer_return_path(customer_return.order, customer_return), no_text: true if can?(:edit, customer_return) %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit_url spree.edit_admin_order_customer_return_path(customer_return.order, customer_return), no_text: true if can?(:edit, customer_return) %>
+            </span>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/return_index/return_authorizations.html.erb

@@ -26,7 +26,7 @@
       <div class="row">
         <div class="col-12 col-lg-6">
           <div class="form-group">
-            <%= f.label :number_cont, Spree.t(:number) %>
+            <%= f.label :number_cont, Spree.t(:return_number) %>
             <%= f.text_field :number_cont, class: "form-control js-quick-search-target js-filterable" %>
           </div>
         </div>
@@ -65,8 +65,10 @@
           <td>
             <span class="badge badge-<%= return_authorization.state %> text-uppercase"><%= Spree.t("return_authorization_states.#{return_authorization.state}") %></span>
           </td>
-          <td class="actions actions-1 text-right">
-            <%= link_to_edit return_authorization, url: spree.edit_admin_order_return_authorization_path(return_authorization.order, return_authorization), no_text: true if can?(:edit, return_authorization) %>
+          <td class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit return_authorization, url: spree.edit_admin_order_return_authorization_path(return_authorization.order, return_authorization), no_text: true if can?(:edit, return_authorization) %>
+            </span>
           </td>
         </tr>
       <% end %>

data/app/views/spree/admin/roles/index.html.erb

@@ -19,9 +19,11 @@
         <% @roles.each do |role| %>
           <tr id="<%= spree_dom_id role %>" data-hook="admin_roles_index_rows">
             <td><%= role.name %></td>
-            <td class="actions text-right">
-              <%= link_to_edit(role, no_text: true) if can? :edit, role %>
-              <%= link_to_delete(role, no_text: true) if can? :destroy, role %>
+            <td class="actions">
+              <span class="d-flex justify-content-end">
+                <%= link_to_edit(role, no_text: true) if can? :edit, role %>
+                <%= link_to_delete(role, no_text: true) if can? :destroy, role %>
+              </span>
             </td>
           </tr>
         <% end %>

data/app/views/spree/admin/shared/_account_nav.html.erb

@@ -1,8 +1,8 @@
 <% if try_spree_current_user %>
   <div class="btn-group">
 
-    <button id="accountNav" type="button" class="btn text-light" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-      <%= svg_icon name: "user.svg", width: '24', height: '24' %>
+    <button id="accountNav" type="button" class="btn text-light px-3" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+      <%= svg_icon name: "user.svg", width: '24', height: '24', classes: 'mb-0' %>
     </button>
 
     <div class="dropdown-menu dropdown-menu-right overflow-hidden mt-2 p-0 mr-2">
@@ -37,10 +37,10 @@
 
       <div class="dropdown-divider m-0"></div>
 
-        <%= link_to 'http://guides.spreecommerce.org', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+        <%= link_to 'http://spreecommerce.org/contact', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
         <%= svg_icon name: "info.svg", width: '18', height: '18' %>
           &nbsp;
-          <%= Spree.t(:help_center) %>
+          <%= Spree.t(:support) %>
         <% end %>
 
         <%= link_to 'http://slack.spreecommerce.org', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
@@ -49,7 +49,7 @@
           <%= Spree.t(:join_slack) %>
         <% end %>
 
-        <%= link_to 'https://github.com/spree-contrib', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
+        <%= link_to 'https://dev-docs.spreecommerce.org/extensions/extensions', target: :blank, class: 'd-block text-dark py-3 px-4 dropdown-item' do %>
         <%= svg_icon name: "extensions.svg", width: '18', height: '18' %>
           &nbsp;
           <%= Spree.t(:extensions_directory) %>

data/app/views/spree/admin/shared/_address_form.html.erb

@@ -5,7 +5,7 @@
       <%= field_container (s_or_b + '_' + field), nil, class: ["form-group", "#{type}-row"] do %>
         <%= f.label :country_id, Spree.t(:country) %>
         <div id="<%= s_or_b %>country">
-          <%= f.collection_select :country_id, available_countries, :id, :name, {}, { class: 'select2 w-100' } %>
+          <%= f.collection_select :country_id, all_countries, :id, :name, {}, { class: 'select2 w-100' } %>
         </div>
       <% end %>
     <% elsif field == "state" %>
@@ -37,8 +37,9 @@
 
 <% content_for :head do %>
   <script>
-    $(document).ready(function(){
-      $('#<%= s_or_b %>country select').on('change', function() { update_state('<%= s_or_b %>'); });
-    });
+    document.addEventListener('DOMContentLoaded', function() {
+      updateAddressState('<%= s_or_b %>');
+      $('#<%= s_or_b %>country select').on('change', function() { updateAddressState('<%= s_or_b %>'); });
+    })
   </script>
 <% end %>

data/app/views/spree/admin/shared/_content_header.html.erb

@@ -1,7 +1,7 @@
-<div id="contentHeader" class="row mb-3">
+<div id="contentHeader" class="row mb-0 pb-0">
   <% if content_for?(:page_title) || content_for?(:page_actions) %>
     <div class="content-header col <%= "with-page-tabs" if content_for?(:page_tabs) %> page-header">
-      <div class="row align-items-center  <%= if content_for?(:page_tabs) then "pb-0" else "border-bottom" end %>">
+      <div id="contentHeaderRow" class="row align-items-center  <%= if content_for?(:page_tabs) then "border-bottom pb-2" else "border-bottom pb-2 mb-3" end %>">
 
         <% if content_for?(:page_title) %>
           <h1 class="contextual-title px-0 mb-0 col">
@@ -33,10 +33,24 @@
       </div>
 
       <% if content_for?(:page_tabs) %>
-        <div class="row">
-          <ul class="nav nav-tabs w-100 mt-4 px-0">
-            <%= yield :page_tabs %>
-          </ul>
+        <div class="row my-2 pb-1 pt-1 align-items-center" data-nav-x-wrapper>
+          <div data-nav-x-container>
+            <ul id="spreePageTabs" class="nav nav-pills flex-nowrap" data-nav-x-content>
+              <%= yield :page_tabs %>
+            </ul>
+          </div>
+
+          <button class="nav-x_Advancer nav-x_Advancer_Left" type="button">
+            <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="bi bi-chevron-left" viewBox="0 0 16 16">
+              <path fill-rule="evenodd" d="M11.354 1.646a.5.5 0 0 1 0 .708L5.707 8l5.647 5.646a.5.5 0 0 1-.708.708l-6-6a.5.5 0 0 1 0-.708l6-6a.5.5 0 0 1 .708 0z" />
+            </svg>
+          </button>
+
+          <button class="nav-x_Advancer nav-x_Advancer_Right" type="button">
+            <svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" class="bi bi-chevron-right" viewBox="0 0 16 16">
+              <path fill-rule="evenodd" d="M4.646 1.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1 0 .708l-6 6a.5.5 0 0 1-.708-.708L10.293 8 4.646 2.354a.5.5 0 0 1 0-.708z" />
+            </svg>
+          </button>
         </div>
       <% end %>
 

data/app/views/spree/admin/shared/_head.html.erb

@@ -15,13 +15,14 @@
 
 <%= stylesheet_link_tag 'spree/backend/all', media: :all %>
 
-<%= render 'spree/shared/paths' %>
+<%= render 'spree/admin/shared/paths' %>
 <%= javascript_include_tag 'spree/backend/all' %>
 <%= render "spree/admin/shared/translations" %>
 
 <script>
   <%== "var AUTH_TOKEN = #{form_authenticity_token.inspect};" %>
   <%== "Spree.api_key = '#{try_spree_current_user.spree_api_key}';" if try_spree_current_user %>
+  <%== "var OAUTH_TOKEN = '#{admin_oauth_token}';" if defined?(admin_oauth_token) %>
   <%== "var ADDRESS_FIELDS = #{Spree::Address::ADDRESS_FIELDS}" %>
   <% if Rails.env.test? %>
   jQuery.fx.off = false