spree_backend 4.2.0.rc4 → 4.2.0.rc5

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,7 +24,7 @@
     </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>

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/_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>

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

@@ -6,7 +6,6 @@
     <%= button_link_to Spree.t(:resend, scope: 'admin.order.events', default: Spree.t(:resend)),
           resend_admin_order_url(order),
           method: :post,
-          icon: 'envelope.svg'
-    %>
+          icon: 'envelope.svg' %>
   <% end %>
 <% end %>

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

@@ -3,10 +3,10 @@
   <div class="table-responsive">
     <table class="table table-condensed table-bordered">
       <thead>
-        <th><%= Spree.t('risk')%></th>
-        <th><%= Spree.t('status')%></th>
+        <th><%= Spree.t('risk') %></th>
+        <th><%= Spree.t('status') %></th>
       </thead>
-      <tbody id="risk-analysis" data-hook="order_details_adjustments"  class="with-border">
+      <tbody id="risk-analysis" data-hook="order_details_adjustments" class="with-border">
         <tr class="">
           <td>
             <strong><%= Spree.t(:failed_payment_attempts) %>:</strong>

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

@@ -71,7 +71,6 @@
             </td>
           </tr>
 
-
         <tr class="edit-tracking is-hidden total">
           <td colspan="5">
             <label><%= Spree.t(:tracking_number) %>:</label>

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

@@ -6,7 +6,7 @@
 
     <td class="item-name">
       <%= link_to item.variant.product.name, edit_admin_product_path(item.variant.product) %>
-      <br />
+      <br>
       <%= "(#{item.variant.options_text})" if item.variant.options_text.present? %>
       <% if item.variant.sku.present? %>
         <strong><%= Spree.t(:sku) %>:</strong> <%= item.variant.sku %>

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

@@ -14,7 +14,7 @@
 
 <% if @order.line_items.empty? %>
   <div class="alert alert-warning">
-    <%= Spree.t(:your_order_is_empty_add_product)%>
+    <%= Spree.t(:your_order_is_empty_add_product) %>
   </div>
 <% end %>
 

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

@@ -33,7 +33,7 @@
                 </span>
               </div>
             <% else %>
-              <div class="radio no-margint">
+              <div class="radio mt-0">
                 <%= label_tag :guest_checkout_true do %>
                   <%= radio_button_tag :guest_checkout, true, guest %>
                   <%= Spree.t(:say_yes) %>

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

@@ -18,7 +18,7 @@
 
 <% if @order.line_items.empty? %>
   <div class="alert alert-warning">
-    <%= Spree.t(:your_order_is_empty_add_product)%>
+    <%= Spree.t(:your_order_is_empty_add_product) %>
   </div>
 <% end %>
 

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

@@ -23,6 +23,7 @@
             <div class="col-12 col-md-6 mb-3 mb-md-0">
               <div class="input-group datePickerFrom"
                    data-wrap="true"
+                   data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
                    data-max-date="<%= params[:q][:created_at_lt] %>">
                 <%= f.text_field :created_at_gt,
                   class: 'form-control js-filterable shadow-none',
@@ -36,6 +37,7 @@
             <div class="col-12 col-md-6 mt-3 mt-md-0">
               <div class="input-group datePickerTo"
                    data-wrap="true"
+                   data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
                    data-min-date="<%= params[:q][:created_at_gt] %>">
 
                 <%= f.text_field :created_at_lt,

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

@@ -20,7 +20,7 @@
       </tr>
     </thead>
     <tbody id="sortVert">
-      <% @payment_methods.each do |method|%>
+      <% @payment_methods.each do |method| %>
         <tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows">
           <td class="move-handle text-center">
             <% if can?(:edit, method) %>

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

@@ -19,12 +19,11 @@
 
         <div class="payment-methods my-3" id="payment_method_<%= method.id %>">
           <% if method.source_required? %>
-            <%=render partial: "spree/admin/payments/source_forms/#{method.method_type}",
+            <%= render partial: "spree/admin/payments/source_forms/#{method.method_type}",
                        locals: {
                          payment_method: method,
                          previous_cards: method.reusable_sources(@order)
-                       }
-            %>
+                       } %>
           <% end %>
         </div>
       <% end %>

data/app/views/spree/admin/payments/show.html.erb

@@ -18,8 +18,7 @@
 <%= render partial: "spree/admin/payments/source_views/#{@payment.payment_method.method_type}",
            locals: {
              payment: @payment.source.is_a?(Spree::Payment) ? @payment.source : @payment
-           }
-%>
+           } %>
 
 <div class="alert alert-success" data-hook="amount">
   <%= Spree.t(:amount) %>: <%= @payment.display_amount.to_html %>

data/app/views/spree/admin/payments/source_forms/_gateway.html.erb

@@ -24,7 +24,7 @@
       </div>
   </div>
 <% end %>
-  <div id="card_form<%= payment_method.id %>" class="margint row" data-hook>
+  <div id="card_form<%= payment_method.id %>" class="mt-3 row" data-hook>
     <% param_prefix = "payment_source[#{payment_method.id}]" %>
 
     <div data-hook="card_number" class="form-group col-12">
@@ -32,7 +32,7 @@
       <%= label_tag "card_number#{payment_method.id}", raw(Spree.t(:card_number) + required_span_tag) %>
       <%= text_field_tag "#{param_prefix}[number]", '', class: 'required form-control cardNumber', id: "card_number#{payment_method.id}", maxlength: 19 %>
       <span id="card_type" style="display:none;">
-        ( <span id="looks_like" ><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
+        ( <span id="looks_like"><%= Spree.t(:card_type_is) %> <span id="type"></span></span>
           <span id="unrecognized"><%= Spree.t(:unrecognized_card_type) %></span>
         )
       </span>

data/app/views/spree/admin/prices/_variant_prices.html.erb

@@ -2,11 +2,11 @@
   <div id="variant_prices-table-wrapper">
     <table class="table sortable">
       <colgroup>
-        <col style="width: 15%" />
-        <col style="width: 30%" />
-        <col style="width: 15%" />
-        <col style="width: 20%" />
-        <col style="width: 20%" />
+        <col style="width: 15%">
+        <col style="width: 30%">
+        <col style="width: 15%">
+        <col style="width: 20%">
+        <col style="width: 20%">
       </colgroup>
       <thead>
         <tr data-hook="variant_prices_header">

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

@@ -6,11 +6,11 @@
 <% end %>
 
 <form>
-  <input class="form-control" placeholder="<%= Spree.t('variant_prices_search_placeholder') %>" type="text" id="variant-price-search"/>
+  <input class="form-control" placeholder="<%= Spree.t('variant_prices_search_placeholder') %>" type="text" id="variant-price-search">
 </form>
 
 <%= form_tag nil, { class: 'form-horizontal' } do %>
-  <div class="mt-3">
+  <div class="my-3">
     <%= render 'variant_prices', variant: @product.master %>
   </div>
   <div class="form-actions" data-hook="buttons">

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

@@ -19,7 +19,7 @@
 <%= form_for @product, url: spree.admin_product_url(@product), method: :put do |f| %>
   <fieldset>
     <div id="prototypes" data-hook></div>
-    <div class=" table-responsive">
+    <div class=" table-responsive mb-3">
       <table id="product_properties" class="table sortable" data-hook data-sortable-link="<%= update_positions_admin_product_product_properties_url %>">
         <thead>
           <tr data-hook="product_properties_header">
@@ -41,7 +41,7 @@
   </fieldset>
 <% end %>
 
-<%= javascript_tag do %>
+<script>
   var properties = <%= raw(@properties.to_json) %>;
   $('#product_properties').on('keydown', 'input.autocomplete', function() {
     already_auto_completed = $(this).is('ac_input');
@@ -50,8 +50,7 @@
       $(this).focus();
     }
   });
-<% end %>
-
+</script>
 
 <style>
   div.ui-helper-hidden-accessible {display:none;}

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

@@ -1,6 +1,4 @@
-
 <div data-hook="admin_product_form_fields">
-
   <div class="row">
 
     <div class="col-12 col-md-8" data-hook="admin_product_form_left">
@@ -68,7 +66,8 @@
 
           <div class="input-group datePickerFrom"
                data-wrap="true"
-               data-max-date="<%= @product.discontinue_on %>" >
+               data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
+               data-max-date="<%= @product.discontinue_on %>">
 
             <%= f.text_field :available_on,
                              value: datepicker_field_value(@product.available_on),
@@ -81,7 +80,6 @@
         <% end %>
       </div>
 
-
       <div data-hook="admin_product_form_discontinue_on">
         <%= f.field_container :discontinue_on, class: ['form-group'] do %>
           <%= f.label :discontinue_on, Spree.t(:discontinue_on) %>
@@ -89,7 +87,8 @@
 
           <div class="input-group datePickerTo"
                data-wrap="true"
-               data-min-date="<%= @product.available_on %>" >
+               data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>"
+               data-min-date="<%= @product.available_on %>">
 
             <%= f.text_field :discontinue_on,
                               value: datepicker_field_value(@product.discontinue_on),
@@ -195,7 +194,7 @@
       <%= f.label :taxon_ids, Spree.t(:taxons) %>
 
       <% if can? :modify, Spree::Classification %>
-        <%= f.select :taxon_ids, options_from_collection_for_select(@product.taxons, :id, :pretty_name, @product.taxons.pluck(:id)), { include_hidden: true }, multiple: true, class: 'select2-hidden-accessible'  %>
+        <%= f.select :taxon_ids, options_from_collection_for_select(@product.taxons, :id, :pretty_name, @product.taxons.pluck(:id)), { include_hidden: true }, multiple: true, class: 'select2-hidden-accessible' %>
       <% elsif @product.taxons.any? %>
         <ul class="text_list">
           <% @product.taxons.each do |taxon| %>

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

@@ -44,7 +44,9 @@
           <%= f.label :available_on, Spree.t(:available_on) %>
           <%= f.error_message_on :available_on %>
 
-          <div class="input-group datepicker" data-wrap="true">
+          <div class="input-group datepicker"
+               data-wrap="true"
+               data-date-format="<%= Spree.t(:js_format, scope: 'date_picker', default: 'Y/m/d') %>">
             <%= f.text_field :available_on,
                              value: datepicker_field_value(@product.available_on),
                              placeholder: Spree.t(:select_a_date),

data/app/views/spree/admin/products/stock.html.erb

@@ -33,8 +33,8 @@
                                       class: 'track_inventory_checkbox', id: "track_inventory_#{ variant.id }" %>
                     <%= Spree.t(:track_inventory) %>
                     <%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?,
-			class: 'variant_track_inventory',
-			id: "variant_track_inventory_#{variant.id}" %>
+      class: 'variant_track_inventory',
+      id: "variant_track_inventory_#{variant.id}" %>
                   <% end %>
                 </div>
               <% end if can?(:update, @product) && can?(:update, variant) %>

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

@@ -8,7 +8,7 @@
     <% options = options_for_select(  Rails.application.config.spree.promotions.actions.map(&:name).map {|name| [ Spree.t("promotion_action_types.#{name.demodulize.underscore}.name"), name] } ) %>
 
     <div class="form-group">
-      <%= label_tag :action_type, Spree.t(:add_action_of_type)%>
+      <%= label_tag :action_type, Spree.t(:add_action_of_type) %>
       <%= select_tag 'action_type', options, class: 'select2' %>
     </div>
     <div class="form-actions">
@@ -18,7 +18,7 @@
   <% end %>
 
   <%= form_for @promotion, url: spree.admin_promotion_path(@promotion), method: :put do |f| %>
-    <div id="actions" class="filter_list margint">
+    <div id="actions" class="filter_list mt-3">
       <% if @promotion.actions.any? %>
         <%= render partial: 'promotion_action',  collection: @promotion.actions %>
       <% else %>
@@ -31,5 +31,4 @@
       <%= button Spree.t('actions.update'), 'save.svg' %>
     </div>
   <% end %>
-
 </div>

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

@@ -1,6 +1,6 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @promotion } %>
 
-<div class="row" id="general_fields" >
+<div class="row" id="general_fields">
   <div class="col-12 col-md-3">
     <%= f.field_container :name, class: ['form-group'] do %>
       <%= f.label :name %>
@@ -63,8 +63,8 @@
       <div class="input-group datePickerFrom"
            data-wrap="true"
            data-enable-time="true"
-           data-date-format="<%= Spree.t('js_date_time', scope: 'date_picker') %>"
-           data-max-date="<%= @promotion.expires_at %>" >
+           data-date-format="<%= Spree.t(:js_date_time, scope: 'date_picker', default: 'Y/m/d - H:i') %>"
+           data-max-date="<%= @promotion.expires_at %>">
         <%= f.datetime_field :starts_at,
                              class: 'form-control shadow-none',
                              placeholder: Spree.t('starting_from'),
@@ -78,9 +78,9 @@
       <%= f.label :expires_at %>
       <div class="input-group datePickerTo"
            data-wrap="true"
-           data-enable-time= 'true'
-           data-date-format= "<%= Spree.t('js_date_time', scope: 'date_picker') %>"
-           data-min-date="<%= @promotion.starts_at %>" >
+           data-enable-time='true'
+           data-date-format="<%= Spree.t(:js_date_time, scope: 'date_picker', default: 'Y/m/d - H:i') %>"
+           data-min-date="<%= @promotion.starts_at %>">
         <%= f.datetime_field :expires_at,
                               placeholder:Spree.t('ends_at'),
                               class: 'form-control shadow-none',