spree_backend 3.7.14.1 → 4.0.0.beta

data/app/views/kaminari/{_first_page.html.erb → twitter-bootstrap-4/_first_page.html.erb}

@@ -6,6 +6,8 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li class="first">
-  <%= link_to_unless current_page.first?, t('views.pagination.first').html_safe, url, remote: remote %>
-</li>
+<% unless current_page.first? %>
+  <li class="first page-item">
+    <%= link_to_unless current_page.first?, raw(t 'views.pagination.first'), url, remote: remote, class: 'page-link' %>
+  </li>
+<% end %>

data/app/views/kaminari/{_gap.html.erb → twitter-bootstrap-4/_gap.html.erb}

@@ -5,4 +5,8 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li class="gap"><a>..</a></li>
+<li class="page gap disabled page-item">
+  <a href="#" onclick="return false;" class="page-link">
+    <%= raw(t 'views.pagination.truncate') %>
+  </a>
+</li>

data/app/views/kaminari/{_last_page.html.erb → twitter-bootstrap-4/_last_page.html.erb}

@@ -6,6 +6,8 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li class="last">
-  <%= link_to_unless current_page.last?, t('views.pagination.last').html_safe, url, remote: remote %>
-</li>
+<% unless current_page.last? %>
+  <li class="last next page-item"><%# "next" class present for border styling in twitter bootstrap %>
+    <%= link_to_unless current_page.last?, raw(t 'views.pagination.last'), url, remote: remote, class: 'page-link' %>
+  </li>
+<% end %>

data/app/views/kaminari/{_next_page.html.erb → twitter-bootstrap-4/_next_page.html.erb}

@@ -6,10 +6,8 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li class="next <%= "disabled" if current_page.last? %>">
-  <% if current_page.last? %>
-    <a href="javascript:;">&raquo;</a>
-  <% else %>
-    <%= link_to_unless current_page.last?, "&raquo;".html_safe, url, rel: 'next', remote: remote %>
-  <% end %>
-</li>
+<% unless current_page.last? %>
+  <li class="next_page page-item">
+    <%= link_to_unless current_page.last?, raw(t 'views.pagination.next'), url, rel: 'next', remote: remote, class: 'page-link' %>
+  </li>
+<% end %>

data/app/views/kaminari/{_page.html.erb → twitter-bootstrap-4/_page.html.erb}

@@ -7,6 +7,12 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li class="<%= 'active' if page.current? %>">
-  <%= link_to page, url, {remote: remote, rel: page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
+<li class="page<%= ' active' if page.current? %> page-item">
+  <%= link_to page,
+    url,
+    opts = {
+      remote: remote,
+      rel: page.next? ? 'next' : page.prev? ? 'prev' : nil,
+      class: 'page-link'
+    } %>
 </li>

data/app/views/kaminari/{_paginator.html.erb → twitter-bootstrap-4/_paginator.html.erb}

@@ -6,8 +6,10 @@
     remote:        data-remote
     paginator:     the paginator that renders the pagination tags inside
 -%>
+<% pagination_class ||= '' %>
+
 <%= paginator.render do %>
-  <ul class="pagination pagination-sm">
+  <ul class="pagination mt-4 <%= pagination_class %>">
     <%= first_page_tag unless current_page.first? %>
     <%= prev_page_tag unless current_page.first? %>
     <% each_page do |page| %>

data/app/views/kaminari/{_prev_page.html.erb → twitter-bootstrap-4/_prev_page.html.erb}

@@ -6,10 +6,8 @@
     per_page:      number of items to fetch per page
     remote:        data-remote
 -%>
-<li class="previous <%= "disabled" if current_page.first? %>">
-  <% if current_page.first? %>
-    <a href="javascript:;">&laquo;</a>
-  <% else %>
-    <%= link_to_unless current_page.first?, "&laquo;".html_safe, url, rel: 'prev', remote: remote %>
-  <% end %>
-</li>
+<% unless current_page.first? %>
+  <li class="prev page-item">
+    <%= link_to_unless current_page.first?, raw(t 'views.pagination.previous'), url, rel: 'prev', remote: remote, class: 'page-link' %>
+  </li>
+<% end %>

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

@@ -4,10 +4,20 @@
 %>
 
 <tr id="<%= spree_dom_id(adjustment) %>" class="<%= adjustment.eligible? ? 'eligible' : 'ineligible' %>" data-hook="adjustment_row">
-  <td><%= display_adjustable(adjustment.adjustable) %></td>
-  <td><%= adjustment.label %></td>
-  <td class="text-center"><%= adjustment.display_amount.to_html %></td>
-  <td class="text-center"><span class="label label-<%= adjustment.state %>"><%= adjustment.state %></td>
+  <td>
+    <%= display_adjustable(adjustment.adjustable) %>
+  </td>
+  <td>
+    <%= adjustment.label %>
+  </td>
+  <td class="text-center">
+    <%= adjustment.display_amount.to_html %>
+  </td>
+  <td class="text-center">
+    <span class="badge badge-<%= adjustment.state %>">
+      <%= adjustment.state %>
+    </span>
+  </td>
   <td class="actions actions-2 text-center">
     <% if adjustment.open? %>
       <%= link_to_edit(adjustment, no_text: true) if can?(:edit, adjustment) %>

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

@@ -1,5 +1,5 @@
-<div class="panel-heading">
-  <h3 class="panel-title"><%= Spree.t(:order_adjustments) %></h3>
+<div class="card-header">
+  <h3 class="card-title mb-0 h5"><%= Spree.t(:order_adjustments) %></h3>
 </div>
 
 <table class="table table-bordered adjustments" data-hook="adjustments">
@@ -18,12 +18,12 @@
 </table>
 
 <% if can?(:edit, Spree::Adjustment) %>
-  <div class="panel-footer">
-    <div class="row text-center">
-      <div class="col-xs-12 col-md-6">
+  <div class="card-footer">
+    <div class="row text-center pb-0">
+      <div class="col-12 col-lg-6">
         <%= button_to Spree.t(:open_all_adjustments), open_adjustments_admin_order_path(@order), method: :get, class: "btn btn-success" %>
       </div>
-      <div class="col-xs-12 col-md-6">
+      <div class="col-12 col-lg-6">
         <%= button_to Spree.t(:close_all_adjustments), close_adjustments_admin_order_path(@order), method: :get, class: "btn btn-danger" %>
       </div>
     </div>

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

@@ -9,7 +9,7 @@
 <% end %>
 
 <% if @adjustments.present? %>
-  <div class="panel panel-default">
+  <div class="card mb-3">
     <%= render partial: 'adjustments_table' %>
   </div>
 <% else %>
@@ -19,11 +19,13 @@
 <% end %>
 
 <% if @order.can_add_coupon? %>
-  <div class="well" data-hook="adjustments_new_coupon_code">
-    <div class="form-group">
-      <%= text_field_tag "coupon_code", "", placeholder: Spree.t(:coupon_code), class: "form-control" %>
+  <div class="card bg-light mb-3" data-hook="adjustments_new_coupon_code">
+    <div class="card-body">
+      <div class="form-group">
+        <%= text_field_tag "coupon_code", "", placeholder: Spree.t(:coupon_code), class: "form-control" %>
+      </div>
+      <%= button Spree.t(:add_coupon_code), 'plus', 'submit', id: "add_coupon_code" %>
     </div>
-    <%= button Spree.t(:add_coupon_code), 'plus', 'submit', id: "add_coupon_code" %>
   </div>
 <% end %>
 

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

@@ -11,7 +11,19 @@
     <%= f.error_message_on :iso_name %>
   <% end %>
 
-  <div data-hook="states_required" class="checkbox">
+  <%= f.field_container :iso, class: ['form-group'], 'data-hook' => 'iso' do %>
+    <%= f.label :iso, Spree.t(:iso) %>
+    <%= f.text_field :iso, class: 'form-control' %>
+    <%= f.error_message_on :iso %>
+  <% end %>
+
+  <%= f.field_container :iso3, class: ['form-group'], 'data-hook' => 'iso3' do %>
+    <%= f.label :iso3, Spree.t(:iso3) %>
+    <%= f.text_field :iso3, class: 'form-control' %>
+    <%= f.error_message_on :iso3 %>
+  <% end %>
+
+  <div data-hook="states_required" class="form-group checkbox">
     <label>
       <%= f.check_box :states_required %>
       <%= Spree.t(:states_required) %>

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

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

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

@@ -8,19 +8,19 @@
     <fieldset class="general no-border-top">
 
       <div class="row">
-        <div class="col-xs-12 col-md-6">
+        <div class="col-12 col-lg-6">
           <%#-------------------------------------------------%>
           <%# Security settings                               %>
           <%#-------------------------------------------------%>
           <% if @preferences_security.any? %>
-            <div class="panel panel-default security">
-              <div class="panel-heading">
-                <h1 class="panel-title">
+            <div class="card mb-3" id="general-settings-security" data-hook="general_settings_security">
+              <div class="card-header">
+                <h1 class="card-title mb-0 h5">
                   <%= Spree.t(:security_settings) %>
                 </h1>
               </div>
 
-              <div class="panel-body">
+              <div class="card-body">
                 <% @preferences_security.each do |key|
                     type = Spree::Config.preference_type(key) %>
                     <div class="checkbox">
@@ -37,12 +37,12 @@
           <%#-------------------------------------------------%>
           <%# Clear cache                                     %>
           <%#-------------------------------------------------%>
-          <div class="panel panel-default">
-            <div class="panel-heading">
-              <h1 class="panel-title"><%= Spree.t(:clear_cache)%></h1>
+          <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>
             </div>
 
-            <div class="panel-body">
+            <div class="card-body">
               <div class="clear-cache-warning alert alert-warning">
                 <%= Spree.t(:clear_cache_warning) %>
               </div>
@@ -53,19 +53,19 @@
           </div>
 
         </div>
-        <div class="col-xs-12 col-md-6">
+        <div class="col-12 col-lg-6">
 
           <%#-------------------------------------------------%>
           <%# Currency Settings                               %>
           <%#-------------------------------------------------%>
-          <div class="panel panel-default currency">
-            <div class="panel-heading">
-              <h1 class="panel-title">
+          <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)%>
               </h1>
             </div>
 
-            <div class="panel-body">
+            <div class="card-body">
               <div class="form-group">
                 <%= label_tag :currency, Spree.t(:choose_currency) %>
                 <%= select_tag :currency, currency_options %>

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

@@ -1,5 +1,5 @@
 <div data-hook="admin_image_form_fields" class="row">
-  <div class="col-xs-12 col-md-6">
+  <div class="col-12 col-md-6">
     <div data-hook="file" class="form-group">
       <%= f.label :attachment, Spree.t(:filename) %>
       <%= f.file_field :attachment %>
@@ -9,7 +9,7 @@
       <%= f.select :viewable_id, @variants, {}, {class: 'select2'} %>
     </div>
   </div>
-  <div data-hook="alt_text" class="col-xs-12 col-md-6">
+  <div data-hook="alt_text" class="col-12 col-md-6">
     <div class="form-group">
       <%= f.label :alt, Spree.t(:alt_text) %>
       <%= f.text_area :alt, rows: 4, class: 'form-control' %>

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

@@ -3,19 +3,19 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @image } %>
 
 <%= form_for [:admin, @product, @image], html: { multipart: true } do |f| %>
-  <div data-hook="edit_image" class="panel panel-default">
-    <div class="panel-heading">
-      <h1 class="panel-title">
+  <div data-hook="edit_image" class="card mb-3">
+    <div class="card-header">
+      <h1 class="card-title mb-0 h5">
         <%= @image.attachment_file_name%>
       </h1>
     </div>
-    <div class="panel-body">
+    <div class="card-body">
       <div class="form-group">
-        <div data-hook="thumbnail" class="col-xs-12 col-md-3 text-center">
+        <div data-hook="thumbnail" class="col-12 col-lg-3 text-center">
           <%= f.label Spree.t(:thumbnail) %>
           <%= link_to image_tag(main_app.url_for(@image.url(:small))), main_app.url_for(@image.url(:product)) %>
         </div>
-        <div class="col-xs-12 col-md-9">
+        <div class="col-12 col-lg-9">
           <%= render partial: 'form', locals: { f: f } %>
         </div>
 

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

@@ -1,5 +1,5 @@
 <div data-hook="admin_option_type_form_fields" class="row">
-  <div class="col-xs-12 col-md-6">
+  <div class="col-12 col-md-6">
     <%= f.field_container :name, class: ['form-group'] do %>
       <%= f.label :name, Spree.t(:name) %> <span class="required">*</span>
       <%= f.text_field :name, class: "form-control" %>
@@ -7,7 +7,7 @@
     <% end %>
   </div>
 
-  <div class="col-xs-12 col-md-6">
+  <div class="col-12 col-md-6">
     <%= f.field_container :presentation, class: ['form-group'] do %>
       <%= f.label :presentation, Spree.t(:presentation) %> <span class="required">*</span>
       <%= f.text_field :presentation, class: "form-control" %>

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

@@ -12,13 +12,13 @@
 <%= render partial: 'spree/admin/shared/error_messages', locals: { target: @option_type } %>
 
 <%= form_for [:admin, @option_type] do |f| %>
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h1 class="panel-title">
+  <div class="card mb-3">
+    <div class="card-header">
+      <h1 class="card-title mb-0 h5">
         <%= Spree.t(:option_values) %>
       </h1>
     </div>
-    <div class="panel-body">
+    <div class="card-body">
       <%= render partial: 'form', locals: { f: f } %>
     </div>
     <table class="table table-condensed table-bordered sortable" data-hook data-sortable-link="<%= update_values_positions_admin_option_types_url %>">
@@ -42,7 +42,7 @@
         <% end %>
       </tbody>
     </table>
-    <div class="panel-footer text-center">
+    <div class="card-footer text-center">
       <%= render partial: 'spree/admin/shared/edit_resource_links' %>
     </div>
   </div>

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

@@ -2,14 +2,14 @@
 
 <%= render partial: "spree/admin/variants/autocomplete_line_items_stock", formats: :js %>
 
-<div id="add-line-item" data-hook class="panel panel-default">
-  <div class="panel-heading">
-    <h1 class="panel-title"><%= Spree.t(:add_product) %></h1>
+<div id="add-line-item" data-hook class="card mb-3">
+  <div class="card-header">
+    <h1 class="card-title mb-0 h5"><%= Spree.t(:add_product) %></h1>
   </div>
-  <div class="panel-body">
+  <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 fullwidth-input" %>
+      <%= hidden_field_tag :add_line_item_variant_id, "", class: "variant_autocomplete d-block w-100" %>
     </div>
 
     <div id="stock_details"></div>

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

@@ -1,16 +1,16 @@
 <%= render partial: "spree/admin/variants/autocomplete", formats: :js %>
 <%= render partial: "spree/admin/variants/autocomplete_stock", formats: :js %>
 
-<div class="panel panel-default" id="add-line-item" data-hook>
-  <div class="panel-heading">
-    <h1 class="panel-title">
+<div class="card mb-3" id="add-line-item" data-hook>
+  <div class="card-header">
+    <h1 class="card-title mb-0 h5">
       <%= Spree.t(:add_product) %>
     </h1>
   </div>
-  <div class="panel-body">
+  <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 fullwidth-input" %>
+      <%= hidden_field_tag :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

@@ -1,7 +1,7 @@
 <% if adjustments.eligible.exists? %>
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h1 class="panel-title">
+  <div class="card mb-3">
+    <div class="card-header">
+      <h1 class="card-title mb-0 h5">
         <%= title %>
       </h1>
     </div>
@@ -31,5 +31,6 @@
         <% end %>
       </tbody>
     </table>
+
   </div>
 <% end %>

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

@@ -1,7 +1,7 @@
 <% if order.line_items.exists? %>
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h1 class="panel-title">
+  <div class="card mb-3">
+    <div class="card-header">
+      <h1 class="card-title mb-0 h5">
         <%= Spree.t(:order_line_items) %>
       </h1>
     </div>
@@ -37,7 +37,7 @@
               <td class="line-item-total text-center"><%= line_item_shipment_price(item, item.quantity) %></td>
               <td class="cart-line-item-delete actions actions-4 text-center" data-hook="cart_line_item_delete">
                 <% if can? :update, item %>
-                  <%= link_to_with_icon 'arrow-left', Spree.t('actions.cancel'), "#", class: 'cancel-line-item btn btn-default btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), style: 'display: none', no_text: true %>
+                  <%= link_to_with_icon 'arrow-left', Spree.t('actions.cancel'), "#", class: 'cancel-line-item btn btn-outline-secondary btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), style: 'display: none', no_text: true %>
                   <%= link_to_with_icon 'save', Spree.t('actions.save'), "#", class: 'save-line-item btn btn-success btn-sm', no_text: true, data: { :'line-item-id' => item.id, action: 'save'}, title: Spree.t('actions.save'), style: 'display: none' %>
                   <%= link_to_with_icon 'edit', Spree.t('edit'), "#", class: 'edit-line-item btn btn-primary btn-sm', data: {action: 'edit'}, title: Spree.t('edit'), no_text: true %>
                   <%= link_to_with_icon 'delete', Spree.t('delete'), "#", class: 'delete-line-item btn btn-danger btn-sm', data: { 'line-item-id' => item.id, action: 'remove'}, title: Spree.t('delete'), no_text: true %>