spree_backend 4.2.0.rc2 → 4.2.1

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

@@ -8,7 +8,9 @@
       -
       <span class="shipment-state"><%= Spree.t("shipment_states.#{shipment.state}") %></span>
       <%= Spree.t(:package_from) %>
-      <strong class="stock-location-name" data-hook="stock-location-name">'<%= shipment.stock_location.name %>'</strong>
+      <strong class="stock-location-name" data-hook="stock-location-name">
+        <%= link_to shipment.stock_location.name, spree.edit_admin_stock_location_url(shipment.stock_location) %>
+      </strong>
       <% if shipment.ready? and can? :update, shipment %>
         <%= link_to Spree.t(:ship), 'javascript:;', class: 'ship ml-auto btn btn-success', data: { 'shipment-number' => shipment.number } %>
         <div class='clearfix'></div>
@@ -69,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/channel.html.erb

@@ -0,0 +1,7 @@
+<%= render 'spree/admin/shared/order_tabs', current: :channel %>
+
+<div data-hook="admin_order_edit_header">
+  <%= render 'spree/admin/shared/error_messages', target: @order %>
+</div>
+
+<%= render 'channel_form', order: @order if can?(:update, @order) %>

data/app/views/spree/admin/orders/customer_details/_autocomplete.js.erb

@@ -1,19 +1,42 @@
 <script type='text/template' id='customer_autocomplete_template'>
-  <div class='customer-autocomplete-item'>
-    <div class='customer-details'>
-      <h5>{{customer.email}}</h5>
-      {{#if bill_address.firstname }}
-        <strong>{{t 'bill_address' }}</strong>
-        {{bill_address.firstname}} {{bill_address.lastname}}<br>
-        {{bill_address.address1}}, {{bill_address.address2}}<br>
-        {{bill_address.city}}<br>
-        {{#if bill_address.state_id }}
-          {{bill_address.state.name}}
+  <div class='customer-autocomplete-item container'>
+    <div class="row">
+      <div class="col">
+        <h5><strong>Email:</strong> {{customer.email}}</h5>
+      </div>
+    </div>
+
+    <div class="row">
+      <div class='customer-details col-6'>
+        {{#if bill_address.firstname }}
+          <strong>{{t 'bill_address' }}</strong><br>
+          {{bill_address.firstname}} {{bill_address.lastname}}<br>
+          {{bill_address.address1}}, {{bill_address.address2}}<br>
+          {{bill_address.city}}<br>
+          {{#if bill_address.state_id }}
+            {{bill_address.state.name}}
+          {{else}}
+            {{bill_address.state_name}}
+          {{/if}}
+          {{bill_address.country.name}}
+        {{/if}}
+    </div>
+
+    <div class='customer-details col-6'>
+      {{#if ship_address.firstname }}
+        <strong>Shipping Address</strong><br>
+        {{ship_address.firstname}} {{ship_address.lastname}}<br>
+        {{ship_address.address1}}, {{ship_address.address2}}<br>
+        {{ship_address.city}}<br>
+        {{#if ship_address.state_id }}
+          {{ship_address.state.name}}
         {{else}}
-          {{bill_address.state_name}}
+          {{ship_address.state_name}}
         {{/if}}
-        {{bill_address.country.name}}
+        {{ship_address.country.name}}
       {{/if}}
     </div>
+
   </div>
+</div>
 </script>

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) %>
@@ -83,8 +83,8 @@
             <%= f.fields_for :ship_address do |sa_form| %>
               <div class="form-group">
                 <span data-hook="use_billing">
-                  <%= check_box_tag 'order[use_billing]', '1', @order.shipping_eq_billing_address? %>
-                  <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address) %>
+                  <%= check_box_tag 'order[use_billing]', '1', @order.shipping_eq_billing_address?, class: 'checkbox' %>
+                  <%= label_tag 'order[use_billing]', Spree.t(:use_billing_address), class: 'form-check-label' %>
                 </span>
               </div>
 

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

@@ -12,7 +12,7 @@
       </h1>
     </div>
     <div class="card-body" id="customer-search-field">
-      <%= hidden_field_tag :customer_search,  nil, class: 'error-message' %>
+      <%= select_tag :customer_search, nil, class: 'd-block w-100' %>
       <%= render partial: "spree/admin/orders/customer_details/autocomplete", formats: :js %>
     </div>
   </div>

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-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
                    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-alt-format="<%= Spree.t(:fpr_human_friendly_date_format, scope: 'date_picker', default: 'M j, Y') %>"
                    data-min-date="<%= params[:q][:created_at_gt] %>">
 
                 <%= f.text_field :created_at_lt,
@@ -67,21 +69,21 @@
           <%= f.select :state_eq,
             Spree::Order.state_machines[:state].states.map {|s| [Spree.t("order_state.#{s.name}"), s.value]},
             { include_blank: true },
-            class: 'select2 js-filterable' %>
+            class: 'select2-clear js-filterable' %>
         </div>
       </div>
 
       <div class="col-12 col-lg-4">
         <div class="form-group">
           <%= label_tag :q_payment_state_eq, Spree.t(:payment_state) %>
-          <%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map {|s| [Spree.t("payment_states.#{s}"), s]}, { include_blank: true }, class: 'select2 js-filterable' %>
+          <%= f.select :payment_state_eq, Spree::Order::PAYMENT_STATES.map {|s| [Spree.t("payment_states.#{s}"), s]}, { include_blank: true }, class: 'select2-clear js-filterable' %>
         </div>
       </div>
 
       <div class="col-12 col-lg-4">
         <div class="form-group">
           <%= label_tag :q_shipment_state_eq, Spree.t(:shipment_state) %>
-          <%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map {|s| [Spree.t("shipment_states.#{s}"), s]}, { include_blank: true }, class: 'select2 js-filterable' %>
+          <%= f.select :shipment_state_eq, Spree::Order::SHIPMENT_STATES.map {|s| [Spree.t("shipment_states.#{s}"), s]}, { include_blank: true }, class: 'select2-clear js-filterable' %>
         </div>
       </div>
 
@@ -124,21 +126,21 @@
       <div class="col-12 col-lg-4">
         <div class="form-group">
           <%= label_tag :q_promotions_id_in, Spree.t(:promotion) %>
-          <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), { include_blank: true }, class: 'select2 js-filterable' %>
+          <%= f.select :promotions_id_in, Spree::Promotion.applied.pluck(:name, :id), { include_blank: true }, class: 'select2-clear js-filterable' %>
         </div>
       </div>
 
       <div class="col-12 col-lg-4">
         <div class="form-group">
           <%= label_tag :q_store_id_in, Spree.t(:store) %>
-          <%= f.select :store_id_in, Spree::Store.order(:name).pluck(:name, :id), { include_blank: true }, class: 'select2 js-filterable' %>
+          <%= f.select :store_id_in, Spree::Store.order(:name).pluck(:name, :id), { include_blank: true }, class: 'select2-clear js-filterable' %>
         </div>
       </div>
 
       <div class="col-12 col-lg-4">
         <div class="form-group">
           <%= label_tag :q_channel_eq, Spree.t(:channel) %>
-          <%= f.select :channel_eq, Spree::Order.distinct.pluck(:channel), { include_blank: true }, class: 'select2 js-filterable' %>
+          <%= f.select :channel_eq, Spree::Order.distinct.pluck(:channel), { include_blank: true }, class: 'select2-clear js-filterable' %>
         </div>
       </div>
 
@@ -206,22 +208,21 @@
           <%= order_time(@show_only_completed ? order.completed_at : order.created_at) %>
         </td>
         <td>
-          <span class="badge badge-<%= order.considered_risky ? 'considered_risky' : 'considered_safe' %>">
+          <span class="badge badge-<%= order.considered_risky ? 'considered_risky' : 'considered_safe' %> text-uppercase">
             <%= order.considered_risky ? Spree.t("risky") : Spree.t("safe") %>
           </span>
         </td>
         <td class="no-wrap">
-          <span class="badge badge-<%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></span>
+          <span class="badge badge-<%= order.state.downcase %> text-uppercase"><%= Spree.t("order_state.#{order.state}") %></span>
           <span class="filterable js-add-filter" data-ransack-field="q_state_eq" data-ransack-value="<%= order.state %>">
             <%= svg_icon name: "filter.svg", width: '14', height: '14' %>
           </span>
         </td>
         <td class="no-wrap">
           <% if order.payment_state %>
-
             <%= link_to Spree.t("payment_states.#{order.payment_state}"),
               admin_order_payments_path(order),
-              class: "badge badge-#{order.payment_state}" %>
+              class: "badge badge-#{order.payment_state} text-uppercase" %>
 
             <span class="filterable js-add-filter"
               data-ransack-field="q_payment_state_eq"
@@ -233,7 +234,7 @@
         <% if Spree::Order.checkout_step_names.include?(:delivery) %>
           <td class="no-wrap">
             <% if order.shipment_state %>
-              <span class="badge badge-<%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") %></span>
+              <span class="badge badge-<%= order.shipment_state %> text-uppercase"><%= Spree.t("shipment_states.#{order.shipment_state}") %></span>
               <span class="filterable js-add-filter" data-ransack-field="q_shipment_state_eq" data-ransack-value="<%= order.shipment_state %>">
                 <%= svg_icon name: "filter.svg", width: '14', height: '14' %>
               </span>

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

@@ -2,59 +2,78 @@
 
   <div data-hook="payment_method" class="row">
 
-    <div class="col-12 col-md-4">
-      <div id="preference-settings" data-hook class="form-group">
-        <%= f.label :type, Spree.t(:provider) %>
-        <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {id: 'gtwy-type', class: 'select2'}) %>
-
-        <% unless @object.new_record? %>
-          <%= preference_fields(@object, f) %>
-
-          <% if @object.respond_to?(:preferences) %>
-            <div id="gateway-settings-warning" class="info warning"><%= Spree.t(:provider_settings_warning) %></div>
-          <% end %>
-        <% end %>
-      </div>
-      <div data-hook="store" class="form-group">
-        <%= label_tag :payment_method_store, Spree.t(:store) %>
-        <%= collection_select(:payment_method, :store_id, @stores, :id, :unique_name, { include_blank: true }, {id: 'store_id', class: 'select2'}) %>
-      </div>
-      <div data-hook="display" class="form-group">
-        <%= label_tag :payment_method_display_on, Spree.t(:display) %>
-        <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, {}, {class: 'select2'}) %>
-      </div>
-      <div data-hook="auto_capture" class="form-group">
-        <%= label_tag :payment_method_auto_capture, Spree.t(:auto_capture) %>
-        <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {class: 'select2'}) %>
-      </div>
-      <div data-hook="active" class="form-group">
-        <strong><%= Spree.t(:active) %></strong>
-        <div class="radio my-2">
-          <%= label_tag :payment_method_active_true do %>
-            <%= radio_button :payment_method, :active, true %>
-            <%= Spree.t(:say_yes) %>
-          <% end %>
+    <div class="col-12 col-md-6">
+      <div class="card mb-3">
+        <div class="card-header">
+          <h5 class="mb-0"><%= Spree.t(:settings) %></h5>
         </div>
+        <div class="card-body">
+          <div class="form-group">
+            <%= f.label :type, Spree.t(:provider) %>
+            <%= collection_select(:payment_method, :type, @providers, :to_s, :name, {}, {id: 'gtwy-type', class: 'select2'}) %>
+          </div>
+          <hr class="my-4">
+          <%= field_container :payment_method, :name, class: ['form-group'], 'data-hook' => 'name' do %>
+            <%= label_tag :payment_method_name, Spree.t(:name) %>
+            <%= text_field :payment_method, :name, class: 'form-control' %>
+            <%= error_message_on :payment_method, :name %>
+          <% end %>
 
-        <div class="radio my-2">
-          <%= label_tag :payment_method_active_false do %>
-            <%= radio_button :payment_method, :active, false %>
-            <%= Spree.t(:say_no) %>
+          <%= field_container :payment_method, :description, class: ['form-group'], 'data-hook' => 'description' do %>
+            <%= label_tag :payment_method_description, Spree.t(:description) %>
+            <%= text_area :payment_method, :description, { cols: 60, rows: 6, class: 'form-control' } %>
           <% end %>
+
+          <div data-hook="store" class="form-group">
+            <%= label_tag :payment_method_stores, Spree.t(:stores) %>
+            <%= collection_select(:payment_method, :store_ids, @stores, :id, :unique_name, {}, { multiple: true, class: 'select2' }) %>
+          </div>
+
+          <div data-hook="display" class="form-group">
+            <%= label_tag :payment_method_display_on, Spree.t(:display) %>
+            <%= select(:payment_method, :display_on, Spree::PaymentMethod::DISPLAY.collect { |display| [Spree.t(display), display.to_s] }, {}, {class: 'select2'}) %>
+          </div>
+          <div data-hook="auto_capture" class="form-group">
+            <%= label_tag :payment_method_auto_capture, Spree.t(:auto_capture) %>
+            <%= select(:payment_method, :auto_capture, [["#{Spree.t(:use_app_default)} (#{Spree::Config[:auto_capture]})", ''], [Spree.t(:say_yes), true], [Spree.t(:say_no), false]], {}, {class: 'select2'}) %>
+          </div>
+
+          <div data-hook="active" class="form-group">
+            <strong><%= Spree.t(:active) %></strong>
+            <div class="radio my-2 form-check">
+              <%= radio_button :payment_method, :active, true, class: 'form-check-input' %>
+              <%= label_tag :payment_method_active_true, Spree.t(:say_yes), class: 'form-check-label' %>
+            </div>
+
+            <div class="radio my-2 form-check">
+              <%= radio_button :payment_method, :active, false, class: 'form-check-input' %>
+              <%= label_tag :payment_method_active_false, Spree.t(:say_no), class: 'form-check-label' %>
+            </div>
+          </div>
         </div>
       </div>
     </div>
 
-    <div class="col-12 col-md-8">
-      <%= field_container :payment_method, :name, class: ['form-group'], 'data-hook' => 'name' do %>
-        <%= label_tag :payment_method_name, Spree.t(:name) %>
-        <%= text_field :payment_method, :name, class: 'form-control' %>
-        <%= error_message_on :payment_method, :name %>
-      <% end %>
-      <%= field_container :payment_method, :description, class: ['form-group'], 'data-hook' => 'description' do %>
-        <%= label_tag :payment_method_description, Spree.t(:description) %>
-        <%= text_area :payment_method, :description, { cols: 60, rows: 6, class: 'form-control' } %>
-      <% end %>
+    <div class="col-12 col-md-6">
+      <div class="card mb-3">
+        <div class="card-header">
+          <h5 class="mb-0"><%= Spree.t(:payment_provider_settings) %></h5>
+        </div>
+        <div class="card-body">
+          <div id="preference-settings" data-hook class="form-group">
+            <% unless @object.new_record? %>
+            <% if preference_fields(@object, f).empty? %>
+              <%= Spree.t('no_payment_provider_settings_message') %>
+            <% end %>
+              <%= preference_fields(@object, f) %>
+
+              <% if @object.respond_to?(:preferences) %>
+                <div id="gateway-settings-warning" class="info warning"><%= Spree.t(:provider_settings_warning) %></div>
+              <% end %>
+            <% end %>
+          </div>
+        </div>
+      </div>
     </div>
   </div>
 </div>

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) %>
@@ -30,7 +30,7 @@
           <td><%= method.name %></td>
           <td><%= method.type.split('::', 3).last %></td>
           <td class="text-center"><%= Spree.t(method.display_on) %></td>
-          <td class="text-center"><%= method.active ? Spree.t(:say_yes) : Spree.t(:say_no) %></td>
+          <td class="text-center"><%= active_badge(method.active) %></td>
           <td data-hook="admin_payment_methods_index_row_actions" class="actions actions-2 text-right">
             <%= link_to_edit(method, no_text: true) if can? :edit, method %>
             <%= link_to_delete(method, no_text: true) if can? :delete, 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

@@ -6,11 +6,10 @@
     </div>
       <div class="form-group previous_cards card-body mb-0" data-hook="previous_cards">
         <ul class="m-0 p-0">
-
             <% previous_cards.each do |card| %>
               <li>
                 <label>
-                  <%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.brand.upcase + ' - ' + card.display_number %>
+                  <%= radio_button_tag :card, card.id, card == previous_cards.first %> <%= card.display_brand + ' - ' + card.display_number %>
                 </label>
               </li>
             <% end %>
@@ -24,7 +23,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 +31,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>