spree_backend 4.2.0.rc2 → 4.2.1

data/app/views/kaminari/admin-twitter-bootstrap-4/_next_page.html.erb

@@ -4,8 +4,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <% unless current_page.last? %>
   <li class="next_page page-item">
     <%= link_to_unless current_page.last?, svg_icon(name: "chevron-right.svg", width: '13', height: '16', classes: 'spree-icon-arrow-right mb-0'), url, rel: 'next', remote: remote, class: 'page-link', 'aria-label': 'Next page' %>

data/app/views/kaminari/admin-twitter-bootstrap-4/_page.html.erb

@@ -5,8 +5,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <li class="page<%= ' active' if page.current? %> page-item">
   <%= link_to page,
     url,

data/app/views/kaminari/admin-twitter-bootstrap-4/_paginator.html.erb

@@ -4,8 +4,8 @@
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
     remote:        data-remote
-    paginator:     the paginator that renders the pagination tags inside
--%>
+    paginator:     the paginator that renders the pagination tags inside -%>
+
 <% pagination_class ||= '' %>
 
 <%= paginator.render do %>

data/app/views/kaminari/admin-twitter-bootstrap-4/_prev_page.html.erb

@@ -4,8 +4,8 @@
     current_page:  a page object for the currently displayed page
     total_pages:   total number of pages
     per_page:      number of items to fetch per page
-    remote:        data-remote
--%>
+    remote:        data-remote -%>
+
 <% unless current_page.first? %>
   <li class="prev page-item">
     <%= link_to_unless current_page.first?, svg_icon(name: "chevron-left.svg", width: '13', height: '16', classes: 'spree-icon-arrow-left mb-0'), url, rel: 'prev', remote: remote, class: 'page-link', 'aria-label': 'Previous page' %>

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

@@ -29,8 +29,8 @@
   </div>
 <% end %>
 
-<%= javascript_tag do %>
+<script>
   var order_number = '<%= @order.number %>';
-<% end %>
+</script>
 
 <%= render partial: 'spree/admin/shared/order_summary' %>

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

@@ -10,9 +10,9 @@
     <thead>
       <tr data-hook="tax_header">
         <th><%= Spree.t(:country_name) %></th>
-        <th><%= Spree.t(:iso3) %></th>
-        <th><%= Spree.t(:states_required) %></th>
-        <th><%= Spree.t(:zipcode_required) %></th>
+        <th class="text-center"><%= Spree.t(:iso3) %></th>
+        <th class="text-center"><%= Spree.t(:states_required) %></th>
+        <th class="text-center"><%= Spree.t(:zipcode_required) %></th>
         <th class="actions"></th>
       </tr>
     </thead>
@@ -20,9 +20,9 @@
       <% @countries.each do |country| %>
         <tr id="<%= spree_dom_id country %>" data-hook="country_row">
           <td><%= country.name %></td>
-          <td><%= country.iso3 %></td>
-          <td class="text-center"><%= country.states_required? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
-          <td class="text-center"><%= country.zipcode_required? ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+          <td class="text-center"><%= country.iso3 %></td>
+          <td class="text-center"><%= active_badge(country.states_required?) %></td>
+          <td class="text-center"><%= active_badge(country.zipcode_required?) %></td>
           <td class="actions actions-2 text-right">
             <%= link_to_edit(country, no_text: true) if can? :edit, country %>
             <%= link_to_delete(country, no_text: true) if can? :delete, country %>

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

@@ -1,52 +1,54 @@
 <div class="table-responsive">
-<table class="show return-items-table table table-condensed table-bordered index">
-  <thead>
-    <tr>
-      <th><%= Spree.t(:product) %></th>
-      <th><%= Spree.t(:sku) %></th>
-      <th><%= Spree.t(:pre_tax_amount) %></th>
-      <th><%= Spree.t(:preferred_reimbursement_type) %></th>
-      <th><%= Spree.t(:exchange_for) %></th>
-      <th><%= Spree.t(:acceptance_errors) %></th>
-      <% if show_decision %>
-        <th></th>
-      <% end %>
-    </tr>
-  </thead>
-  <tbody>
-    <% return_items.each do |return_item| %>
+  <table class="show return-items-table table table-condensed table-bordered index">
+    <thead>
       <tr>
-        <td>
-          <div class="variant-name"><%= return_item.inventory_unit.variant.name %></div>
-          <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
-        </td>
-        <td>
-          <%= return_item.inventory_unit.variant.sku %>
-        </td>
-        <td>
-          <%= return_item.display_pre_tax_amount %>
-        </td>
-        <td>
-          <%= reimbursement_type_name(return_item.preferred_reimbursement_type) %>
-        </td>
-        <td>
-          <%= return_item.exchange_variant.try(:exchange_name) %>
-        </td>
-        <td>
-          <%= return_item.acceptance_status_errors %>
-        </td>
+        <th><%= Spree.t(:product) %></th>
+        <th><%= Spree.t(:sku) %></th>
+        <th><%= Spree.t(:pre_tax_amount) %></th>
+        <th><%= Spree.t(:preferred_reimbursement_type) %></th>
+        <th><%= Spree.t(:exchange_for) %></th>
+        <th><%= Spree.t(:acceptance_errors) %></th>
         <% if show_decision %>
-          <td class='actions actions-2'>
-            <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-success btn-sm', params: { "return_item[acceptance_status]" => 'accepted' }, "data-action" => 'save', title: Spree.t(:accept), method: 'put' } do %>
-              <%= Spree.t(:accept) %>
-            <% end if can?(:accept, return_item) %>
-            <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-danger btn-sm', params: { "return_item[acceptance_status]" => 'rejected' }, "data-action" => 'remove', title: Spree.t(:reject), method: 'put' } do %>
-              <%= Spree.t(:reject) %>
-            <% end if can?(:reject, return_item) %>
-          </td>
+          <th></th>
         <% end %>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </thead>
+    <tbody>
+      <% return_items.each do |return_item| %>
+        <tr>
+          <td>
+            <div class="variant-name">
+              <%= link_to return_item.inventory_unit.variant.name, spree.edit_admin_product_path(return_item.inventory_unit.variant.product) %>
+            </div>
+            <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
+          </td>
+          <td>
+            <%= return_item.inventory_unit.variant.sku %>
+          </td>
+          <td>
+            <%= return_item.display_pre_tax_amount %>
+          </td>
+          <td>
+            <%= reimbursement_type_name(return_item.preferred_reimbursement_type) %>
+          </td>
+          <td>
+            <%= return_item.exchange_variant.try(:exchange_name) %>
+          </td>
+          <td>
+            <%= return_item.acceptance_status_errors if return_item.acceptance_status_errors.present? %>
+          </td>
+          <% if show_decision %>
+            <td class='actions actions-2'>
+              <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-success btn-sm', params: { "return_item[acceptance_status]" => 'accepted' }, "data-action" => 'save', title: Spree.t(:accept), method: 'put' } do %>
+                <%= Spree.t(:accept) %>
+              <% end if can?(:accept, return_item) %>
+              <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-danger btn-sm', params: { "return_item[acceptance_status]" => 'rejected' }, "data-action" => 'remove', title: Spree.t(:reject), method: 'put' } do %>
+                <%= Spree.t(:reject) %>
+              <% end if can?(:reject, return_item) %>
+            </td>
+          <% end %>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
 </div>

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

@@ -25,7 +25,9 @@
             <%= item_fields.check_box :returned, {checked: false, class: 'add-item', "data-price" => return_item.pre_tax_amount}, '1', '0' %>
           </td>
           <td>
-            <div class="variant-name"><%= return_item.inventory_unit.variant.name %></div>
+            <div class="variant-name">
+              <%= link_to return_item.inventory_unit.variant.name, spree.edit_admin_product_path(return_item.inventory_unit.variant.product) %>
+            </div>
             <div class="variant-options"><%= return_item.inventory_unit.variant.options_text %></div>
           </td>
           <td>

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

@@ -44,7 +44,7 @@
 </fieldset>
 
 <% if !@customer_return.fully_reimbursed? && @pending_reimbursements.empty? && can?(:create, Spree::Reimbursement) %>
-  <fieldset data-hook="reimbursements" class="marginb">
+  <fieldset data-hook="reimbursements" class="mb-3">
     <% if @customer_return.completely_decided? %>
       <%= form_for [:admin, @order, Spree::Reimbursement.new] do |f| %>
         <%= hidden_field_tag :build_from_customer_return_id, @customer_return.id %>

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

@@ -32,9 +32,9 @@
             <td><%= pretty_time(customer_return.created_at) %></td>
             <td>
               <% if customer_return.fully_reimbursed? %>
-                <span class="badge badge-success"><%= Spree.t(:reimbursed) %></span>
+                <strong class="badge badge-success text-uppercase"><%= Spree.t(:reimbursed) %></strong>
               <% else %>
-                <span class="badge badge-info"><%= Spree.t(:incomplete) %></span>
+                <strong class="badge badge-inactive text-uppercase"><%= Spree.t(:incomplete) %></strong>
               <% end %>
             </td>
             <td class='actions actions-1' data-hook="admin_orders_customer_returns_index_row_actions">

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

@@ -24,7 +24,7 @@
 
         <%= f.field_container :stock_location, class: ['form-group'] do %>
           <%= f.label :stock_location, Spree.t(:stock_location) %> <span class="required">*</span>
-          <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name.humanize, l.id]}, {include_blank: true}, {class: 'select2', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
+          <%= f.select :stock_location_id, Spree::StockLocation.order_default.active.to_a.collect{|l|[l.name.humanize, l.id]}, {include_blank: true}, {class: 'select2-clear', "data-placeholder" => Spree.t(:select_a_stock_location)} %>
           <%= f.error_message_on :stock_location %>
         <% end %>
       </div>

data/app/views/spree/admin/general_settings/edit.html.erb

@@ -39,7 +39,7 @@
           <%#-------------------------------------------------%>
           <div class="card mb-3" id="general-settings-cache" data-hook="general_settings_cache">
             <div class="card-header">
-              <h1 class="card-title mb-0 h5"><%= Spree.t(:clear_cache)%></h1>
+              <h1 class="card-title mb-0 h5"><%= Spree.t(:clear_cache) %></h1>
             </div>
 
             <div class="card-body">
@@ -61,16 +61,39 @@
           <div class="card mb-3" id="general-settings-currency" data-hook="general_settings_currency">
             <div class="card-header">
               <h1 class="card-title mb-0 h5">
-                <%= Spree.t(:currency_settings)%>
+                <%= Spree.t(:currency_settings) %>
               </h1>
             </div>
 
             <div class="card-body">
+              <div class="alert alert-warning col-12">
+                This can be overriden by individual Store settings
+              </div>
               <div class="form-group">
-                <%= label_tag :currency, Spree.t(:choose_currency) %>
+                <%= label_tag :currency, Spree.t(:default_currency) %>
                 <%= select_tag :currency, currency_options %>
               </div>
-              <%= render partial: 'form' %>
+            </div>
+          </div>
+
+          <div class="card mb-3" id="general-settings-stores" data-hook="general_settings_stores">
+            <div class="card-header">
+              <h1 class="card-title mb-0 h5">
+                <%= Spree.t(:multiple_stores) %>
+              </h1>
+            </div>
+            <div class="card-body">
+              <div class="alert alert-warning col-12">
+                <%= Spree.t('show_store_selector.long') %>
+              </div>
+              <div class="form-group">
+                <div class="checkbox">
+                  <label>
+                    <%= check_box('', :show_store_selector, { checked: Spree::Config.show_store_selector }) %>
+                    <%= Spree.t('show_store_selector.short') %>
+                  </label>
+                </div>
+              </div>
             </div>
           </div>
         </div>

data/app/views/spree/admin/images/edit.html.erb

@@ -6,7 +6,7 @@
   <div data-hook="edit_image" class="card mb-3">
     <div class="card-header">
       <h1 class="card-title mb-0 h5">
-        <%= @image.attachment_file_name%>
+        <%= @image.attachment_file_name %>
       </h1>
     </div>
     <div class="card-body">

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

@@ -1,4 +1,4 @@
-<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :payments }%>
+<%= render partial: 'spree/admin/shared/order_tabs', locals: { current: :payments } %>
 
 <% content_for :page_title do %>
   /

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

@@ -24,13 +24,13 @@
     </thead>
     <tbody id="sortVert">
       <% @option_types.each do |option_type| %>
-        <tr class="spree_option_type <%= cycle('odd', 'even')%>" id="<%= spree_dom_id option_type %>" data-hook="option_row">
+        <tr class="spree_option_type <%= cycle('odd', 'even') %>" id="<%= spree_dom_id option_type %>" data-hook="option_row">
           <td class="move-handle text-center">
             <%= svg_icon name: "sort.svg", width: '18', height: '18' %>
           </td>
           <td><%= option_type.name %></td>
           <td class="presentation"><%= option_type.presentation %></td>
-          <td><%= option_type.filterable %></td>
+          <td><%= active_badge(option_type.filterable) %></td>
           <td class="actions actions-2 text-right">
             <%= link_to_edit(option_type, class: 'admin_edit_option_type', no_text: true) if can?(:edit, option_type) %>
             <%= link_to_delete(option_type, no_text: true) if can?(:delete, option_type) %>

data/app/views/spree/admin/orders/_add_line_item.html.erb

@@ -9,7 +9,7 @@
   <div class="card-body">
     <div data-hook="add_product_name" class="form-group">
       <%= label_tag :add_line_item_variant_id, Spree.t(:name_or_sku) %>
-      <%= hidden_field_tag :add_line_item_variant_id, "", class: "variant_autocomplete d-block w-100" %>
+      <%= select_tag 'add_line_item_variant_id', nil , class: 'variant_autocomplete d-block w-100' %>
     </div>
 
     <div id="stock_details"></div>

data/app/views/spree/admin/orders/_add_product.html.erb

@@ -10,7 +10,7 @@
   <div class="card-body">
     <div data-hook="add_product_name">
       <%= label_tag :add_variant_id, Spree.t(:name_or_sku) %>
-      <%= hidden_field_tag :add_variant_id, "", class: "variant_autocomplete d-block w-100" %>
+      <%= select_tag 'variants', nil, id: :add_variant_id, class: 'variant_autocomplete d-block w-100' %>
     </div>
 
     <div id="stock_details"></div>

data/app/views/spree/admin/orders/_adjustments.html.erb

@@ -9,8 +9,8 @@
       <table class="table table-bordered">
         <thead>
           <tr>
-            <th><%= Spree.t('name')%></th>
-            <th><%= Spree.t('amount')%></th>
+            <th><%= Spree.t('name') %></th>
+            <th><%= Spree.t('amount') %></th>
           </tr>
         </thead>
         <tbody id="order-charges" data-hook="order_details_adjustments">

data/app/views/spree/admin/orders/_channel_form.html.erb

@@ -0,0 +1,18 @@
+<div data-hook="channel-form-container">
+  <%= form_for [:admin, order], method: :put, url: set_channel_admin_order_url do |f| %>
+    <fieldset>
+    <div data-hook="admin_order_channel_field">
+      <%= f.field_container :channel, class: %w[form-group] do %>
+        <%= f.label :channel, Spree.t(:channel) %>
+        <%= f.text_field :channel, name: 'channel', class: 'form-control' %>
+        <%= f.error_message_on :channel %>
+      <% end %>
+    </div>
+    <div class="form-actions" data-hook="buttons">
+      <%= button Spree.t('actions.update'), 'refresh', 'submit', { class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
+      <span class="or"><%= Spree.t(:or) %></span>
+      <%= button_link_to Spree.t('actions.cancel'), edit_admin_order_url(order), icon: 'delete' %>
+    </div>
+    <fieldset>
+  <% end %>
+</div>

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

@@ -12,18 +12,15 @@
   <%= render "spree/admin/orders/adjustments",
         adjustments: @order.line_item_adjustments,
         order: order,
-        title: Spree.t(:line_item_adjustments)
-  %>
+        title: Spree.t(:line_item_adjustments) %>
   <%= render "spree/admin/orders/adjustments",
         adjustments: @order.shipment_adjustments,
         order: order,
-        title: Spree.t(:shipment_adjustments)
-  %>
+        title: Spree.t(:shipment_adjustments) %>
   <%= render "spree/admin/orders/adjustments",
         adjustments: @order.adjustments,
         order: order,
-        title: Spree.t(:order_adjustments)
-  %>
+        title: Spree.t(:order_adjustments) %>
 
   <% if order.line_items.exists? %>
     <div class="alert alert-success" id="order-total" data-hook="order_details_total">
@@ -34,7 +31,7 @@
     </div>
   <% end %>
 
-  <%= javascript_tag do %>
+  <script>
     var order_number = '<%= @order.number %>';
     var shipments = [];
 
@@ -46,11 +43,10 @@
             :id, :tracking, :number, :state, :stock_location_id
           ], include: [
             :inventory_units, :stock_location
-          ]).to_json
-        %>
+          ]).to_json %>
       );
     <% end %>
 
     <%= render partial: 'spree/admin/shared/update_order_state', formats: [:js], handlers: [:erb] %>
-  <% end %>
+  </script>
 </div>

data/app/views/spree/admin/orders/_line_items.html.erb

@@ -24,7 +24,7 @@
               </td>
               <td class="line-item-name text-center">
                 <%= link_to item.name, edit_admin_product_path(item.variant.product) %>
-                <br />
+                <br>
                 <%= "(#{item.options_text})" if item.options_text.present? %>
               </td>
               <td class="line-item-price text-center"><%= item.single_money.to_html %></td>

data/app/views/spree/admin/orders/_line_items_edit_form.html.erb

@@ -7,18 +7,15 @@
   <%= render "spree/admin/orders/adjustments",
           adjustments: @order.line_item_adjustments,
           order: order,
-          title: Spree.t(:line_item_adjustments)
-  %>
+          title: Spree.t(:line_item_adjustments) %>
   <%= render "spree/admin/orders/adjustments",
           adjustments: @order.shipment_adjustments,
           order: order,
-          title: Spree.t(:shipment_adjustments)
-  %>
+          title: Spree.t(:shipment_adjustments) %>
   <%= render "spree/admin/orders/adjustments",
           adjustments: @order.adjustments,
           order: order,
-          title: Spree.t(:order_adjustments)
-  %>
+          title: Spree.t(:order_adjustments) %>
 
   <% if order.line_items.exists? %>
     <div class="alert alert-success" id="order-total" data-hook="order_details_total">
@@ -26,7 +23,7 @@
     </div>
   <% end %>
 
-  <%= javascript_tag do %>
+  <script>
     var order_number = '<%= @order.number %>';
     var shipments = [];
 
@@ -35,5 +32,5 @@
     <% end %>
 
     <%= render partial: 'spree/admin/shared/update_order_state', formats: [:js], handlers: [:erb] %>
-  <% end %>
+  </script>
 </div>