spree_backend 3.7.14.1 → 4.0.0.beta

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

@@ -11,7 +11,7 @@
           <strong><%= Spree.t(:failed_payment_attempts) %>:</strong>
         </td>
         <td>
-          <span class="label label-<%= @order.payments.failed.size > 0 ? 'void' : 'complete' %>">
+          <span class="badge badge-<%= @order.payments.failed.size > 0 ? 'void' : 'complete' %>">
             <%= link_to "#{Spree.t 'payments_count', count: @order.payments.failed.size, default: pluralize(@order.payments.failed.size, Spree.t(:payment))}", spree.admin_order_payments_path(@order) %>
           </span>
         </td>
@@ -20,7 +20,7 @@
       <tr>
         <td><strong><%= Spree.t(:avs_response) %>:</strong></td>
         <td>
-          <span class="label label-<%= latest_payment.is_avs_risky? ? 'void' : 'complete' %>">
+          <span class="badge badge-<%= latest_payment.is_avs_risky? ? 'void' : 'complete' %>">
             <% if latest_payment.is_avs_risky? %>
               <%= "#{Spree.t(:error)}: #{avs_response_code[latest_payment.avs_response]}" %>
             <% else %>
@@ -33,7 +33,7 @@
       <tr>
         <td><strong><%= Spree.t(:cvv_response) %>:</strong></td>
         <td>
-          <span class="label label-<%= latest_payment.is_cvv_risky? ? 'void' : 'complete' %>">
+          <span class="badge badge-<%= latest_payment.is_cvv_risky? ? 'void' : 'complete' %>">
             <% if latest_payment.is_cvv_risky? %>
               <%= "#{Spree.t(:error)}: #{cvv_response_code[latest_payment.cvv_response_code]}" %>
             <% else %>

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

@@ -1,16 +1,16 @@
-<div id="<%= "shipment_#{shipment.id}" %>" data-hook="admin_shipment_form" class="panel panel-default">
+<div id="<%= "shipment_#{shipment.id}" %>" data-hook="admin_shipment_form" class="card mb-3">
 
   <%= render partial: "spree/admin/variants/split", formats: :js %>
 
-  <div class="panel-heading stock-location no-borderb" data-hook="stock-location">
-    <h1 class="panel-title">
+  <div class="card-header stock-location no-borderb" data-hook="stock-location">
+    <h1 class="d-flex flex-wrap align-items-center card-title mb-0 h5">
       <span class="shipment-number"><%= shipment.number %></span>
       -
       <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>
       <% if shipment.ready? and can? :update, shipment %>
-        <%= link_to Spree.t(:ship), 'javascript:;', class: 'ship pull-right btn btn-success', data: { 'shipment-number' => shipment.number } %>
+        <%= link_to Spree.t(:ship), 'javascript:;', class: 'ship ml-auto btn btn-success', data: { 'shipment-number' => shipment.number } %>
         <div class='clearfix'></div>
       <% end %>
     </h1>
@@ -75,7 +75,7 @@
             <label><%= Spree.t(:tracking_number) %>:</label>
             <%= text_field_tag :tracking, shipment.tracking, class: "form-control" %>
           </td>
-          <td class="actions">
+          <td class="actions text-center">
             <% if can? :update, shipment %>
               <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), "#", class: 'cancel-tracking btn btn-primary btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
               <%= link_to_with_icon 'save', Spree.t('actions.save'), "#", class: 'save-tracking btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>

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

@@ -33,7 +33,7 @@
 
     <td class="cart-item-delete actions actions-3 text-center" data-hook="cart_item_delete">
       <% if((!shipment.shipped?) && can?(:update, item.line_item)) %>
-        <%= link_to_with_icon 'pencil', Spree.t('actions.edit'), "#", class: 'edit-item btn btn-default btn-sm', title: Spree.t('actions.edit'), no_text: true %>
+        <%= link_to_with_icon 'pencil', Spree.t('actions.edit'), "#", class: 'edit-item btn btn-outline-secondary btn-sm', title: Spree.t('actions.edit'), no_text: true %>
         <%= link_to_with_icon 'cancel', Spree.t('actions.cancel'), "#", class: 'cancel-item  btn btn-primary btn-sm', data: { action: 'cancel' }, title: Spree.t('actions.cancel'), style: 'display: none', no_text: true %>
         <%= link_to_with_icon 'ok', Spree.t('actions.save'), "#", class: 'save-item btn btn-success btn-sm', data: {'shipment-number' => shipment.number, 'variant-id' => item.variant.id, action: 'save'}, title: Spree.t('actions.save'), style: 'display: none', no_text: true %>
         <%= link_to_with_icon 'split', Spree.t('split'), "#", class: 'split-item btn btn-primary btn-sm', data: {action: 'split', 'variant-id' => item.variant.id}, title: Spree.t('split'), no_text: true %>

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

@@ -1,16 +1,16 @@
 <div data-hook="admin_customer_detail_form_fields">
 
-  <div class="panel panel-default" data-hook="customer_guest">
+  <div class="card mb-3" data-hook="customer_guest">
 
-    <div class="panel-heading">
-      <h1 class="panel-title">
+    <div class="card-header">
+      <h1 class="card-title mb-0 h5">
         <%= Spree.t(:account) %>
       </h1>
     </div>
 
-    <div class="panel-body">
+    <div class="card-body">
       <div data-hook="customer_fields" class="row">
-        <div class="col-xs-12 col-md-8">
+        <div class="col-12 col-lg-8">
           <div class="form-group">
             <%= f.label :email, Spree.t(:email) %>
             <% if can? :edit, @order.user %>
@@ -20,14 +20,14 @@
             <% end %>
           </div>
         </div>
-        <div class="col-xs-12 col-md-4">
+        <div class="col-12 col-lg-4">
           <div class="form-group">
             <strong><%= label_tag nil, Spree.t(:guest_checkout) %></strong>
             <% guest = @order.user.nil? %>
 
             <% if @order.completed? %>
               <div>
-                <span class="badge">
+                <span class="badge badge-secondary">
                   <%= guest ? Spree.t(:say_yes) : Spree.t(:say_no) %>
                   <%= hidden_field_tag :guest_checkout, guest %>
                 </span>
@@ -55,13 +55,13 @@
   </div>
 
   <div class="row">
-    <div data-hook="bill_address_wrapper" class="col-xs-12 col-md-6">
-      <div class="panel panel-default">
-        <div class="panel-heading">
-          <h1 class="panel-title"><%= Spree.t(:billing_address) %></h1>
+    <div data-hook="bill_address_wrapper" class="col-12 col-lg-6">
+      <div class="card mb-3">
+        <div class="card-header">
+          <h1 class="card-title mb-0 h5"><%= Spree.t(:billing_address) %></h1>
         </div>
 
-        <div class="panel-body">
+        <div class="card-body">
           <% if can? :edit, @order.user %>
             <%= f.fields_for :bill_address do |ba_form| %>
               <%= render 'spree/admin/shared/address_form', f: ba_form, type: "billing" %>
@@ -73,12 +73,12 @@
       </div>
     </div>
 
-    <div class="col-xs-12 col-md-6" data-hook="ship_address_wrapper">
-      <div class="panel panel-default">
-        <div class="panel-heading">
-          <h1 class="panel-title"><%= Spree.t(:shipping_address) %></h1>
+    <div class="col-12 col-lg-6" data-hook="ship_address_wrapper">
+      <div class="card mb-3">
+        <div class="card-header">
+          <h1 class="card-title mb-0 h5"><%= Spree.t(:shipping_address) %></h1>
         </div>
-        <div class="panel-body">
+        <div class="card-body">
           <% if can? :edit, @order.user %>
             <%= f.fields_for :ship_address do |sa_form| %>
               <div class="form-group">

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

@@ -5,13 +5,13 @@
 <% end %>
 
 <% if can? :edit, @order.user %>
-  <div id="select-customer" class="panel panel-default" data-hook>
-    <div class="panel-heading">
-      <h1 class="panel-title">
+  <div id="select-customer" class="card mb-3" data-hook>
+    <div class="card-header">
+      <h1 class="card-title mb-0 h5">
         <%= Spree.t(:customer_search) %>
       </h1>
     </div>
-    <div class="panel-body">
+    <div class="card-body">
       <%= hidden_field_tag :customer_search,  nil, class: 'error-message' %>
       <%= render partial: "spree/admin/orders/customer_details/autocomplete", formats: :js %>
     </div>

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

@@ -3,7 +3,11 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_order), new_admin_order_url, class: "btn-success", icon: 'add', id: 'admin_new_order' %>
+  <%= button_link_to Spree.t(:new_order),
+    new_admin_order_url,
+    class: "btn-success",
+      icon: 'add',
+      id: 'admin_new_order' %>
 <% end if can? :create, Spree::Order %>
 
 <% content_for :table_filter do %>
@@ -11,32 +15,42 @@
 
     <%= search_form_for [:admin, @search] do |f| %>
       <div class="row">
-        <div class="date-range-filter col-xs-12 col-md-8">
+        <div class="date-range-filter col-12 col-lg-8">
           <div class="form-group">
             <%= label_tag :q_created_at_gt, Spree.t(:date_range) %>
-            <div class="row no-padding-bottom">
-              <div class="col-xs-12 col-md-6">
+            <div class="row pb-0">
+              <div class="col-12 col-lg-6">
                 <div class="input-group">
-                  <%= f.text_field :created_at_gt, class: 'datepicker datepicker-from form-control js-filterable', value: params[:q][:created_at_gt], placeholder: Spree.t(:start) %>
-                  <span class="input-group-addon">
-                    <i class="icon icon-calendar"></i>
-                  </span>
+                  <%= f.text_field :created_at_gt,
+                    class: 'datepicker datepicker-from form-control js-filterable',
+                      value: params[:q][:created_at_gt],
+                      placeholder: Spree.t(:start) %>
+                  <div class="input-group-append">
+                    <span class="input-group-text">
+                      <i class="icon icon-calendar"></i>
+                    </span>
+                  </div>
                 </div>
 
               </div>
-              <div class="col-xs-12 col-md-6">
+              <div class="col-12 col-lg-6">
                 <div class="input-group">
-                  <%= f.text_field :created_at_lt, class: 'datepicker datepicker-to form-control js-filterable', value: params[:q][:created_at_lt], placeholder: Spree.t(:stop) %>
-                  <span class="input-group-addon">
-                    <i class="icon icon-calendar"></i>
-                  </span>
+                  <%= f.text_field :created_at_lt,
+                    class: 'datepicker datepicker-to form-control js-filterable',
+                      value: params[:q][:created_at_lt],
+                      placeholder: Spree.t(:stop) %>
+                  <div class="input-group-append">
+                    <span class="input-group-text">
+                      <i class="icon icon-calendar"></i>
+                    </span>
+                  </div>
                 </div>
               </div>
             </div>
           </div>
         </div>
 
-        <div class="col-xs-12 col-md-4">
+        <div class="col-12 col-lg-4">
           <div class="form-group">
             <%= label_tag :q_number_cont, Spree.t(:order_number, number: '') %>
             <%= f.text_field :number_cont, class: 'form-control js-quick-search-target js-filterable' %>
@@ -47,21 +61,24 @@
 
       <div class="row">
 
-        <div class="col-xs-12 col-md-4">
+        <div class="col-12 col-lg-4">
           <div class="form-group">
             <%= label_tag :q_state_eq, Spree.t(:status) %>
-            <%= 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' %>
+            <%= 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' %>
           </div>
         </div>
 
-        <div class="col-xs-12 col-md-4">
+        <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' %>
           </div>
         </div>
 
-        <div class="col-xs-12 col-md-4">
+        <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' %>
@@ -72,21 +89,21 @@
 
       <div class="row">
 
-        <div class="col-xs-12 col-md-4">
+        <div class="col-12 col-lg-4">
           <div class="form-group">
             <%= label_tag :q_bill_address_firstname_start, Spree.t(:first_name_begins_with) %>
             <%= f.text_field :bill_address_firstname_start, class: 'form-control js-filterable' %>
           </div>
         </div>
 
-        <div class="col-xs-12 col-md-4">
+        <div class="col-12 col-lg-4">
           <div class="form-group">
             <%= label_tag :q_bill_address_lastname_start, Spree.t(:last_name_begins_with) %>
             <%= f.text_field :bill_address_lastname_start, class: 'form-control js-filterable' %>
           </div>
         </div>
 
-        <div class="col-xs-12 col-md-4">
+        <div class="col-12 col-lg-4">
           <div class="form-group">
             <%= label_tag :q_email_cont, Spree.t(:email) %>
             <%= f.text_field :email_cont, class: 'form-control js-filterable' %>
@@ -97,46 +114,46 @@
 
       <div class="row">
 
-        <div class="col-xs-12 col-md-4">
+        <div class="col-12 col-lg-4">
           <div class="form-group">
             <%= label_tag :q_line_items_variant_sku_eq, Spree.t(:sku) %>
             <%= f.text_field :line_items_variant_sku_eq, class: 'form-control js-filterable' %>
           </div>
         </div>
 
-        <div class="col-xs-12 col-md-4">
+        <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' %>
           </div>
         </div>
 
-        <div class="col-xs-12 col-md-4">
+        <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' %>
           </div>
         </div>
 
-        <div class="col-xs-12 col-md-4">
+        <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' %>
           </div>
         </div>
 
-        <div class="col-xs-12 col-md-4">
+        <div class="col-12 col-lg-4">
 
           <div class="form-group">
 
-            <div class="checkbox">
+            <div class="checkbox mt-2">
               <%= label_tag 'q_completed_at_not_null' do %>
                 <%= f.check_box :completed_at_not_null, {checked: @show_only_completed}, '1', '0' %>
                 <%= Spree.t(:show_only_complete_orders) %>
               <% end %>
             </div>
 
-            <div class="checkbox">
+            <div class="checkbox mt-2">
               <%= label_tag 'q_considered_risky_eq' do %>
                 <%= f.check_box :considered_risky_eq, {checked: (params[:q][:considered_risky_eq] == '1')}, '1', '' %>
                 <%= Spree.t(:show_only_considered_risky) %>
@@ -190,24 +207,30 @@
         </td>
         <td><%= link_to order.number, edit_admin_order_path(order) %></td>
         <td>
-          <span class="label label-<%= order.considered_risky ? 'considered_risky' : 'considered_safe' %>">
+          <span class="badge badge-<%= order.considered_risky ? 'considered_risky' : 'considered_safe' %>">
             <%= order.considered_risky ? Spree.t("risky") : Spree.t("safe") %>
           </span>
         </td>
         <td>
-          <span class="label label-<%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></span>
+          <span class="badge badge-<%= order.state.downcase %>"><%= Spree.t("order_state.#{order.state.downcase}") %></span>
           <span class="icon icon-filter filterable js-add-filter" data-ransack-field="q_state_eq" data-ransack-value="<%= order.state %>"></span>
         </td>
         <td>
           <% if order.payment_state %>
-            <span class="label label-<%= order.payment_state %>"><%= link_to Spree.t("payment_states.#{order.payment_state}"), admin_order_payments_path(order) %></span>
-            <span class="icon icon-filter filterable js-add-filter" data-ransack-field="q_payment_state_eq" data-ransack-value="<%= order.payment_state %>"></span>
+
+            <%= link_to Spree.t("payment_states.#{order.payment_state}"),
+              admin_order_payments_path(order),
+              class: "badge badge-#{order.payment_state}" %>
+
+            <span class="icon icon-filter filterable js-add-filter"
+              data-ransack-field="q_payment_state_eq"
+              data-ransack-value="<%= order.payment_state %>"></span>
           <% end %>
         </td>
         <% if Spree::Order.checkout_step_names.include?(:delivery) %>
           <td>
             <% if order.shipment_state %>
-              <span class="label label-<%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") %></span>
+              <span class="badge badge-<%= order.shipment_state %>"><%= Spree.t("shipment_states.#{order.shipment_state}") %></span>
               <span class="icon icon-filter filterable js-add-filter" data-ransack-field="q_shipment_state_eq" data-ransack-value="<%= order.shipment_state %>"></span>
             <% end %>
           </td>

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

@@ -2,7 +2,7 @@
 
   <div data-hook="payment_method" class="row">
 
-    <div class="col-xs-12 col-md-4">
+    <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'}) %>
@@ -25,14 +25,14 @@
       </div>
       <div data-hook="active" class="form-group">
         <strong><%= Spree.t(:active) %></strong>
-        <div class="radio">
+        <div class="radio my-2">
           <%= label_tag :payment_method_active_true do %>
             <%= radio_button :payment_method, :active, true %>
             <%= Spree.t(:say_yes) %>
           <% end %>
         </div>
 
-        <div class="radio">
+        <div class="radio my-2">
           <%= label_tag :payment_method_active_false do %>
             <%= radio_button :payment_method, :active, false %>
             <%= Spree.t(:say_no) %>
@@ -41,7 +41,7 @@
       </div>
     </div>
 
-    <div class="col-xs-12 col-md-8">
+    <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' %>

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

@@ -19,16 +19,16 @@
         <td class="text-center"><%= payment_method_name(payment) %></td>
         <td class="text-center"><%= payment.transaction_id %></td>
         <td class="text-center">
-          <span class="label label-<%= payment.state %>">
+          <span class="badge badge-<%= payment.state %>">
             <%= Spree.t(payment.state, scope: :payment_states, default: payment.state.capitalize) %>
           </span>
         </td>
         <td class="actions actions-2 text-center">
           <% payment.actions.each do |action| %>
             <% if action == 'credit' %>
-              <%= link_to_with_icon('refund', Spree.t(:refund), new_admin_order_payment_refund_path(@order, payment), no_text: true, class: "btn btn-default btn-sm") if can?(:create, Spree::Refund) %>
+              <%= link_to_with_icon('refund', Spree.t(:refund), new_admin_order_payment_refund_path(@order, payment), no_text: true, class: "btn btn-outline-secondary btn-sm") if can?(:create, Spree::Refund) %>
             <% else %>
-              <%= link_to_with_icon(action, Spree.t(action), fire_admin_order_payment_path(@order, payment, e: action), method: :put, no_text: true, data: { action: action }, class: "btn btn-default btn-sm") if can?(action.to_sym, payment) %>
+              <%= link_to_with_icon(action, Spree.t(action), fire_admin_order_payment_path(@order, payment, e: action), method: :put, no_text: true, data: { action: action }, class: "btn btn-outline-secondary btn-sm") if can?(action.to_sym, payment) %>
             <% end %>
           <% end %>
         </td>

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

@@ -20,7 +20,7 @@
 
 <% if @payments.any? %>
 
-  <div data-hook="payment_list" class="panel panel-default no-border-bottom table-wrapper">
+  <div data-hook="payment_list" class="mb-3">
     <%= render partial: 'list', locals: { payments: @payments } %>
   </div>
 

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

@@ -2,8 +2,16 @@
 <%= render 'spree/admin/shared/error_messages', target: @product %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to(Spree.t(:add_product_properties), "javascript:;", { icon: 'add', :'data-target' => "tbody#product_properties", class: 'btn-success spree_add_fields' }) %>
-  <span class="js-new-ptype-link"><%= button_link_to Spree.t(:select_from_prototype), available_admin_prototypes_url, { icon: 'properties', remote: true, 'data-update' => 'prototypes', class: 'btn-default' } %></span>
+  <%= button_link_to(
+    Spree.t(:add_product_properties),
+    "javascript:;",
+    { icon: 'add', :'data-target' => "tbody#product_properties", class: 'btn-success spree_add_fields' }) %>
+
+  <span class="js-new-ptype-link">
+    <%= button_link_to Spree.t(:select_from_prototype),
+      available_admin_prototypes_url,
+      { icon: 'properties', remote: true, 'data-update' => 'prototypes', class: 'btn-outline-secondary' } %>
+  </span>
 <% end if can? :create, Spree::ProductProperty %>
 
 <%= form_for @product, url: spree.admin_product_url(@product), method: :put do |f| %>