spree_backend 4.7.1 → 4.8.0

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

@@ -21,7 +21,7 @@
   <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: :put, class: "btn btn-success" %>
+        <%= button_to Spree.t(:open_all_adjustments), open_adjustments_admin_order_path(@order), method: :put, class: "btn btn-primary" %>
       </div>
       <div class="col-12 col-lg-6">
         <%= button_to Spree.t(:close_all_adjustments), close_adjustments_admin_order_path(@order), method: :put, class: "btn btn-danger" %>

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

@@ -16,17 +16,17 @@
 
               <span id="visibilityStatus" class="d-flex align-items-center">
                 <span class="page_hidden badge badge-pill badge-secondary <% if @cms_page.visible? %>d-none<% end %>">
-                  <%= svg_icon name: "eye-slash-fill.svg", width: '18', height: '18' %> <%= Spree.t('admin.cms.draft_mode') %>
+                  <%= svg_icon name: "eye-slash-fill.svg", width: '14', height: '14' %> <%= Spree.t('admin.cms.draft_mode') %>
                 </span>
 
                 <span class="page_visible badge badge-pill badge-primary <% if @cms_page.draft_mode? %>d-none<% end %>">
-                  <%= svg_icon name: "view.svg", width: '18', height: '18' %> <%= Spree.t('admin.cms.visible') %>
+                  <%= svg_icon name: "view.svg", width: '14', height: '14' %> <%= Spree.t('admin.cms.visible') %>
                 </span>
               </span>
             </div>
             <div class="col-auto d-flex align-items-center">
               <span class="badge badge-pill badge-secondary">
-                  <%= svg_icon name: "translate.svg", width: '18', height: '18' %> <%= locale_full_name(@cms_page.locale) %>
+                  <%= svg_icon name: "translate.svg", width: '14', height: '14' %> <%= locale_full_name(@cms_page.locale) %>
               </span>
             </div>
           </div>

data/app/views/spree/admin/cms_pages/_live_preview_area.html.erb

@@ -4,7 +4,7 @@
       <hr class="mt-4 hide-on-full-screen-mode">
       <div class="row">
         <div class="col d-flex justify-content-start">
-          <%= button_link_to Spree.t('admin.cms.add_new_section'), spree.new_admin_cms_page_cms_section_path(@cms_page), icon: 'add.svg', class: 'no-wrap btn btn-success align-self-center' %>
+          <%= button_link_to Spree.t('admin.cms.add_new_section'), spree.new_admin_cms_page_cms_section_path(@cms_page), icon: 'add.svg', class: 'no-wrap btn btn-primary align-self-center' %>
         </div>
         <div class="col d-none d-md-flex justify-content-end">
           <div id="LiveViewSwitcher" class="btn-group btn-group-toggle" data-toggle="buttons">

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t('admin.cms.add_new_page'), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'new_page' } %>
+  <%= button_link_to Spree.t('admin.cms.add_new_page'), new_object_url, { class: "btn-primary", icon: 'add.svg', id: 'new_page' } %>
 <% end if can?(:create, Spree::CmsPage) %>
 
 <% content_for :table_filter do %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_country), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'admin_new_country' } %>
+  <%= button_link_to Spree.t(:new_country), new_object_url, { class: "btn-primary", icon: 'add.svg', id: 'admin_new_country' } %>
 <% end if can? :create, Spree::Country %>
 <div class="table-responsive border rounded bg-white">
   <table class="table" id='listing_countries' data-hook>

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

@@ -40,7 +40,7 @@
           <% if show_decision %>
             <td class='actions'>
               <span class="d-flex justify-content-end">
-                <%= 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 %>
+                <%= button_to [:admin, return_item], { class: 'with-tip display-inline btn btn-primary 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 %>

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

@@ -2,7 +2,7 @@
 
 <% content_for :page_actions do %>
   <% if @order.shipments.any?(&:shipped?) && can?(:create, Spree::CustomerReturn) %>
-    <%= button_link_to Spree.t(:new_customer_return), spree.new_admin_order_customer_return_path(@order), icon: 'add.svg', class: 'btn-success' %>
+    <%= button_link_to Spree.t(:new_customer_return), spree.new_admin_order_customer_return_path(@order), icon: 'add.svg', class: 'btn-primary' %>
   <% end %>
 <% end %>
 

data/app/views/spree/admin/dashboard/_getting_started.html.erb

@@ -1,4 +1,4 @@
-<h4 class="mb-3"><%= Spree.t('admin.gettting_started.lets_get_you_started') %></h4>
+<h4 class="mb-3"><%= Spree.t('admin.getting_started.lets_get_you_started') %></h4>
 
 <div class="row mb-3">
   <div class="col-4">
@@ -9,7 +9,7 @@
         <% else %>
           <%= svg_icon name: 'tags', width: 20, height: 20, classes: "mr-3" %>
         <% end %>
-        <%= Spree.t('admin.gettting_started.add_products') %>
+        <%= Spree.t('admin.getting_started.add_products') %>
       </a>
       <a class="list-group-item list-group-item-action <% if @shipping_methods_added %>list-group-item-info<% elsif @active_tab == 'shipping' %>active<% end %>" id="list-shipping-list" data-toggle="list" href="#list-shipping" role="tab" aria-controls="shipping">
         <% if @shipping_methods_added %>
@@ -17,7 +17,7 @@
         <% else %>
           <%= svg_icon name: 'truck', width: 20, height: 20, classes: "mr-3" %>
         <% end %>
-        <%= Spree.t('admin.gettting_started.setup_shipping') %>
+        <%= Spree.t('admin.getting_started.setup_shipping') %>
       </a>
       <a class="list-group-item list-group-item-action <% if @payment_methods_added %>list-group-item-info<% elsif @active_tab == 'payments' %>active<% end %>" id="list-payments-list" data-toggle="list" href="#list-payments" role="tab" aria-controls="payments">
         <% if @payment_methods_added %>
@@ -25,7 +25,7 @@
         <% else %>
           <%= svg_icon name: 'cash-coin', width: 20, height: 20, classes: "mr-3" %>
         <% end %>
-        <%= Spree.t('admin.gettting_started.setup_payment_method') %>
+        <%= Spree.t('admin.getting_started.setup_payment_method') %>
       </a>
       <a class="list-group-item list-group-item-action <% if @taxes_added %>list-group-item-info<% elsif @active_tab == 'taxes' %>active<% end %>" id="list-taxes-list" data-toggle="list" href="#list-taxes" role="tab" aria-controls="taxes">
         <% if @taxes_added %>
@@ -33,7 +33,7 @@
         <% else %>
           <%= svg_icon name: 'receipt', width: 20, height: 20, classes: "mr-3" %>
         <% end %>
-        <%= Spree.t('admin.gettting_started.setup_taxes') %>
+        <%= Spree.t('admin.getting_started.setup_taxes') %>
       </a>
     </div>
   </div>
@@ -41,19 +41,19 @@
     <div class="tab-content" id="nav-tabContent">
       <div class="tab-pane fade <% if @active_tab == 'products'%>show active<% end %>" id="list-products" role="tabpanel" aria-labelledby="list-products-list">
         <% if @products_added %>
-          <p><%= Spree.t('admin.gettting_started.products_section.message_with_products_html', count: current_store.products.count ) %></p>
+          <p><%= Spree.t('admin.getting_started.products_section.message_with_products_html', count: current_store.products.count ) %></p>
         <% else %>
           <p>
-            <%= Spree.t('admin.gettting_started.products_section.message_without_products') %>
-            <%= link_to(Spree.t('admin.gettting_started.products_section.import_message'), 'https://api.spreecommerce.org/docs/api-v2/27527143a4edf-create-a-product') %>
+            <%= Spree.t('admin.getting_started.products_section.message_without_products') %>
+            <%= link_to(Spree.t('admin.getting_started.products_section.import_message'), 'https://api.spreecommerce.org/docs/api-v2/27527143a4edf-create-a-product') %>
           </p>
-          <%= link_to_with_icon 'add.svg', Spree.t('admin.gettting_started.add_products'), spree.admin_products_path, class: 'btn btn-success btn-sm mb-2' %>
+          <%= link_to_with_icon 'add.svg', Spree.t('admin.getting_started.add_products'), spree.admin_products_path, class: 'btn btn-primary btn-sm mb-2' %>
         <% end %>
       </div>
       <div class="tab-pane fade <% if @active_tab == 'shipping'%>show active<% end %>" id="list-shipping" role="tabpanel" aria-labelledby="list-shipping-list">
         <% if @shipping_methods_added %>
           <p>
-            <%= Spree.t('admin.gettting_started.shipping_section.message_with_shipping') %>
+            <%= Spree.t('admin.getting_started.shipping_section.message_with_shipping') %>
             <% @shippable_countries.each do |country| %>
               <strong class="mr-2">
                 <%= country.name %>
@@ -63,33 +63,33 @@
           </p>
         <% else %>
           <p>
-            <%= Spree.t('admin.gettting_started.shipping_section.message_without_shipping') %>
+            <%= Spree.t('admin.getting_started.shipping_section.message_without_shipping') %>
           </p>
-          <%= link_to_with_icon 'settings.svg', Spree.t('admin.gettting_started.setup_shipping'), spree.admin_shipping_methods_path, class: 'btn btn-primary btn-sm mb-2' %>
+          <%= link_to_with_icon 'settings.svg', Spree.t('admin.getting_started.setup_shipping'), spree.admin_shipping_methods_path, class: 'btn btn-primary btn-sm mb-2' %>
         <% end %>
       </div>
       <div class="tab-pane fade <% if @active_tab == 'payments'%>show active<% end %>" id="list-payments" role="tabpanel" aria-labelledby="list-payments-list">
         <% if @payment_methods_added %>
           <p>
-            <%= Spree.t('admin.gettting_started.payment_methods_section.message_with_payment_method') %>
+            <%= Spree.t('admin.getting_started.payment_methods_section.message_with_payment_method') %>
           </p>
         <% else %>
           <p>
-            <%= Spree.t('admin.gettting_started.payment_methods_section.message_without_payment_method') %>
+            <%= Spree.t('admin.getting_started.payment_methods_section.message_without_payment_method') %>
           </p>
-          <%= link_to_with_icon 'settings.svg', Spree.t('admin.gettting_started.setup_payment_method'), spree.admin_payment_methods_path, class: 'btn btn-primary btn-sm mb-2' %>
+          <%= link_to_with_icon 'settings.svg', Spree.t('admin.getting_started.setup_payment_method'), spree.admin_payment_methods_path, class: 'btn btn-primary btn-sm mb-2' %>
         <% end %>
       </div>
       <div class="tab-pane fade <% if @active_tab == 'taxes' %>show active<% end %>" id="list-taxes" role="tabpanel" aria-labelledby="list-taxes-list">
         <% if @taxes_added %>
           <p>
-            <%= Spree.t('admin.gettting_started.taxes_section.message_with_taxes') %>
+            <%= Spree.t('admin.getting_started.taxes_section.message_with_taxes') %>
           </p>
         <% else %>
           <p>
-            <%= Spree.t('admin.gettting_started.taxes_section.message_without_taxes') %>
+            <%= Spree.t('admin.getting_started.taxes_section.message_without_taxes') %>
           </p>
-          <%= link_to_with_icon 'settings.svg', Spree.t('admin.gettting_started.setup_taxes_calculation'), spree.admin_tax_rates_path, class: 'btn btn-primary btn-sm mb-2' %>
+          <%= link_to_with_icon 'settings.svg', Spree.t('admin.getting_started.setup_taxes_calculation'), spree.admin_tax_rates_path, class: 'btn btn-primary btn-sm mb-2' %>
         <% end %>
 
       </div>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t('admin.data_feeds.new_data_feed'), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_data_feed_link' %>
+  <%= button_link_to Spree.t('admin.data_feeds.new_data_feed'), new_object_url, class: "btn-primary", icon: 'add.svg', id: 'admin_new_data_feed_link' %>
 <% end if can?(:create, Spree::DataFeed) %>
 
 <% if @data_feeds.present? %>

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

@@ -47,7 +47,7 @@
         <tr id="<%= spree_dom_id image %>" data-hook="images_row">
           <td class="move-handle text-center">
             <% if can? :edit, image %>
-              <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
+              <%= svg_icon name: "grip-vertical.svg", width: '14', height: '14' %>
             <% end %>
           </td>
           <td class="image text-center">

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

@@ -31,7 +31,7 @@
              <h5 class="mb-0 align-self-center"><%= Spree.t('admin.navigation.menu_items', menu_name: @menu.name) %></h5>
             </div>
             <div class="col d-flex justify-content-end">
-              <%= button_link_to Spree.t('admin.navigation.add_new_item', menu: @menu.name), spree.new_admin_menu_menu_item_path(@menu), icon: 'add.svg', class: 'no-wrap btn btn-success align-self-center' %>
+              <%= button_link_to Spree.t('admin.navigation.add_new_item', menu: @menu.name), spree.new_admin_menu_menu_item_path(@menu), icon: 'add.svg', class: 'no-wrap btn btn-primary align-self-center' %>
             </div>
           </div>
         </div>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t('admin.navigation.add_new_menu'), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'new_menu' } %>
+  <%= button_link_to Spree.t('admin.navigation.add_new_menu'), new_object_url, { class: "btn-primary", icon: 'add.svg', id: 'new_menu' } %>
 <% end if can?(:create, Spree::Menu) %>
 
 <% content_for :table_filter do %>

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

@@ -3,13 +3,13 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t('admin.oauth_applications.new'), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_role_link' %>
+  <%= button_link_to Spree.t('admin.oauth_applications.new'), new_object_url, class: "btn-primary", icon: 'add.svg', id: 'admin_new_role_link' %>
 <% end if can? :create, Spree::OauthApplication %>
 
   <div class="card bg-light">
     <div class="card-body">
       <%=Spree.t('admin.oauth_applications.documentation_message')%>
-      <%= link_to(Spree.t('admin.oauth_applications.documentation_cta'), 'https://dev-docs.spreecommerce.org/api/platform-api/authenticating-requests')%>
+      <%= link_to(Spree.t('admin.oauth_applications.documentation_cta'), 'https://docs.spreecommerce.org/api-reference/platform/authentication')%>
     </div>
   </div>
 
@@ -33,7 +33,7 @@
                 <%= password_field_tag :password, application.uid, class: 'form-control unhide text-muted border-0 shadow-none bg-transparent', data: { password_toggle_target: 'unhide' }, readonly: true %>
                 <div class="input-group-append">
                   <%= button_tag class: 'btn btn-link rounded', data: { action: 'click->password-toggle#password' } do %>
-                    <%= svg_icon name: "view.svg", width: '18', height: '18' %>
+                    <%= svg_icon name: "view.svg", width: '14', height: '14' %>
                   <% end %>
                 </div>
               </div>

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

@@ -1,6 +1,6 @@
 <tr class="option_value fields" id="spree_<%= dom_id(f.object) %>" data-hook="option_value">
   <td class="move-handle text-center">
-    <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
+    <%= svg_icon name: "grip-vertical.svg", width: '14', height: '14' %>
     <%= f.hidden_field :id %>
   </td>
   <td class="name"><%= f.text_field :name, class: "form-control", required: true %></td>

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

@@ -40,7 +40,7 @@
             <tr>
               <td colspan="4">
                 <div id="new_add_option_value" class="d-flex" data-hook>
-                  <%= button_link_to Spree.t(:add_option_value), "javascript:;", { icon: 'add.svg', :'data-target' => "tbody#sortVert", class: 'btn-success mx-auto spree_add_fields' } %>
+                  <%= button_link_to Spree.t(:add_option_value), "javascript:;", { icon: 'add.svg', :'data-target' => "tbody#sortVert", class: 'btn-primary mx-auto spree_add_fields' } %>
                 </div>
               </td>
             </tr>

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

@@ -4,7 +4,7 @@
 
 <% content_for :page_actions do %>
   <span id="new_ot_link">
-    <%= button_link_to Spree.t(:new_option_type), new_object_url, { class: "btn-success", icon: 'add.svg', id: 'new_option_type_link' } %>
+    <%= button_link_to Spree.t(:new_option_type), new_object_url, { class: "btn-primary", icon: 'add.svg', id: 'new_option_type_link' } %>
   </span>
 <% end if can?(:create, Spree::OptionType) %>
 
@@ -26,7 +26,7 @@
       <% @option_types.each do |option_type| %>
         <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: "grip-vertical.svg", width: '18', height: '18' %>
+            <%= svg_icon name: "grip-vertical.svg", width: '14', height: '14' %>
           </td>
           <td><%= option_type.name %></td>
           <td class="presentation"><%= option_type.presentation %></td>

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

@@ -9,7 +9,7 @@
       <% end %>
     </div>
     <div class="form-actions" data-hook="buttons">
-      <%= button Spree.t('actions.update'), 'recycle.svg', 'submit', { class: 'btn-success', data: { disable_with: "#{ Spree.t(:saving) }..." }} %>
+      <%= button Spree.t('actions.update'), 'recycle.svg', 'submit', { class: 'btn-primary', 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: 'cancel.svg' %>
     </div>

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

@@ -39,7 +39,7 @@
                 <span class="d-flex justify-content-center">
                   <% if can? :update, item %>
                     <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-line-item btn btn-light btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), style: 'display: none', no_text: true %>
-                    <%= link_to_with_icon 'save.svg', 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 'save.svg', Spree.t('actions.save'), "#", class: 'save-line-item btn btn-primary 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.svg', Spree.t('edit'), "#", class: 'edit-line-item btn btn-light btn-sm', data: {action: 'edit'}, title: Spree.t('edit'), no_text: true %>
                     <%= link_to_with_icon 'delete.svg', 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 %>
                   <% end %>

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

@@ -3,19 +3,21 @@
   <%= render partial: "spree/admin/variants/split", formats: :js %>
 
   <div class="card-header stock-location no-borderb" data-hook="stock-location">
-    <h5 class="flex-wrap align-items-center card-title mb-0 h6">
-      <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">
-        <%= link_to shipment.stock_location.name, spree.edit_admin_stock_location_url(shipment.stock_location) %>
-      </strong>
+    <div class="d-flex align-items-center justify-content-between">
+      <h5 class="flex-wrap align-items-center card-title mb-0 h6">
+        <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">
+          <%= link_to shipment.stock_location.name, spree.edit_admin_stock_location_url(shipment.stock_location) %>
+        </strong>
+      </h5>
       <% 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 } %>
+        <%= link_to Spree.t(:ship), 'javascript:;', class: 'ship ml-auto btn btn-primary', data: { 'shipment-number' => shipment.number } %>
         <div class='clearfix'></div>
       <% end %>
-    </h5>
+    </div>
   </div>
 
   <div class="table-responsive bg-white">
@@ -47,7 +49,7 @@
               <span class="d-flex justify-content-center">
                 <% if can? :update, shipment %>
                   <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-method btn btn-light btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
-                  <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-method btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
+                  <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-method btn btn-primary btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
                 <% end %>
               </span>
             </td>
@@ -84,7 +86,7 @@
             <span class="d-flex justify-content-center">
               <% if can? :update, shipment %>
                 <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-tracking btn btn-light btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
-                <%= link_to_with_icon 'save.svg', 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 %>
+                <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-tracking btn btn-primary btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
               <% end %>
             </span>
           </td>

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

@@ -36,7 +36,7 @@
         <% if((!shipment.shipped?) && can?(:update, item.line_item)) %>
           <%= link_to_with_icon 'edit.svg', Spree.t('actions.edit'), "#", class: 'edit-item btn btn-light btn-sm', title: Spree.t('actions.edit'), no_text: true %>
           <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-item  btn btn-light btn-sm', data: { action: 'cancel' }, title: Spree.t('actions.cancel'), style: 'display: none', no_text: true %>
-          <%= link_to_with_icon 'save.svg', 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 'save.svg', Spree.t('actions.save'), "#", class: 'save-item btn btn-primary 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.svg', Spree.t('split'), "#", class: 'split-item btn btn-light btn-sm', data: {action: 'split', 'variant-id' => item.variant.id}, title: Spree.t('split'), no_text: true %>
           <%= link_to_with_icon 'delete.svg', Spree.t('delete'), "#", class: 'delete-item btn btn-danger btn-sm', data: { 'shipment-number' => shipment.number, 'variant-id' => item.variant.id, action: 'remove'}, title: Spree.t('delete'), no_text: true %>
         <% end %>

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

@@ -56,14 +56,26 @@
       </div>
     </div>
 
+    <% unless @object.new_record? %>
     <div class="col-12 col-md-6">
+
+    <% if @object.respond_to?(:payment_configuration_guide) %>
+      <div class="card mb-3">
+        <div class="card-header">
+          <h5 class="mb-0"><%= Spree.t(:payment_method_configuration) %></h5>
+        </div>
+        <div class="card-body">
+        <%= render "spree/admin/payment_methods/configuration_guides/#{@object.payment_configuration_guide}" %>
+        </div>
+    </div>
+    <% end %>
+
       <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 %>
@@ -72,10 +84,11 @@
               <% 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>
+    <% end %>
+
   </div>
 </div>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_payment_method), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_payment_methods_link' %>
+  <%= button_link_to Spree.t(:new_payment_method), new_object_url, class: "btn-primary", icon: 'add.svg', id: 'admin_new_payment_methods_link' %>
 <% end if can? :create, Spree::PaymentMethod %>
 
 <% content_for :table_filter do %>
@@ -41,7 +41,7 @@
         <tr id="<%= spree_dom_id method %>" data-hook="admin_payment_methods_index_rows">
           <td class="move-handle text-center">
             <% if can?(:edit, method) %>
-              <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
+              <%= svg_icon name: "grip-vertical.svg", width: '14', height: '14' %>
             <% end %>
           </td>
           <td><%= method.name %></td>

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

@@ -1,12 +1,12 @@
 <tr class="product_property fields" id="spree_<%= dom_id(f.object) %>" data-hook="product_property">
   <% if f.object.persisted? && can?(:edit, f.object) %>
   <td class="move-handle">
-    <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
+    <%= svg_icon name: "grip-vertical.svg", width: '14', height: '14' %>
     <%= f.hidden_field :id %>
   </td>
   <% else %>
   <td style="opacity:0.2;">
-    <%= svg_icon name: "grip-vertical.svg", width: '18', height: '18' %>
+    <%= svg_icon name: "grip-vertical.svg", width: '14', height: '14' %>
     <%= f.hidden_field :id %>
   </td>
   <% end %>
@@ -25,7 +25,7 @@
         <%= link_to_delete f.object, no_text: true %>
       <% else %>
       <span class="btn btn-danger btn-sm icon-link disabled" style="opacity:0.2;">
-        <%= svg_icon name: "delete.svg", width: '18', height: '18' %>
+        <%= svg_icon name: "delete.svg", width: '14', height: '14' %>
       </span>
       <% end %>
     </span>

data/app/views/spree/admin/products/_autocomplete.js.erb

@@ -7,7 +7,7 @@
         </a>
         <div class="dropdown p-0">
           <button class="btn btn-light dropdown-toggle products-ddb btn-sm" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-            <%= svg_icon name: "chevron-down.svg", width: '18', height: '18' %>
+            <%= svg_icon name: "chevron-down.svg", width: '14', height: '14' %>
           </button>
           <div class="dropdown-menu dropdown-menu-right p-2" aria-labelledby="dropdownMenuButton">
             <a href="{{ edit_product_url product.id }}" class="edit-product js-edit-product dropdown-item p-1"><%= Spree.t(:edit) %></a>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_promotion_category), new_object_url, icon: 'add.svg', class: 'btn-success' %>
+  <%= button_link_to Spree.t(:new_promotion_category), new_object_url, icon: 'add.svg', class: 'btn-primary' %>
 <% end if can?(:create, Spree::PromotionCategory) %>
 
 <% if @promotion_categories.any? %>

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

@@ -12,7 +12,7 @@
       <%= select_tag 'action_type', options, class: 'select2' %>
     </div>
     <div class="form-actions">
-      <%= button Spree.t(:add), 'add.svg', 'submit', class: "btn-success" %>
+      <%= button Spree.t(:add), 'add.svg', 'submit', class: "btn-primary" %>
     </div>
 
   <% end %>

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

@@ -12,7 +12,7 @@
       <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), class: 'select2') %>
     </div>
     <div class="form-actions">
-      <%= button Spree.t(:add), 'add.svg', 'submit', class: "btn-success" %>
+      <%= button Spree.t(:add), 'add.svg', 'submit', class: "btn-primary" %>
     </div>
 
   <% end %>

data/app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb

@@ -14,7 +14,7 @@
 </div>
 
 <div class="js-tiers"></div>
-<button class="btn btn-success js-add-tier"><%= Spree.t(:add) %></button>
+<button class="btn btn-primary js-add-tier"><%= Spree.t(:add) %></button>
 
 <script type="text/x-handlebars-template" id="tier-input-name">
   <%= prefix %>[calculator_attributes][preferred_tiers][{{base}}]

data/app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb

@@ -14,7 +14,7 @@
 </div>
 
 <div class="js-tiers"></div>
-<button class="btn btn-success js-add-tier"><%= Spree.t(:add) %></button>
+<button class="btn btn-primary js-add-tier"><%= Spree.t(:add) %></button>
 
 <script type="text/x-handlebars-template" id="tier-input-name">
   <%= prefix %>[calculator_attributes][preferred_tiers][{{base}}]

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_promotion), new_object_url, class: "btn-success", icon: 'add.svg' %>
+  <%= button_link_to Spree.t(:new_promotion), new_object_url, class: "btn-primary", icon: 'add.svg' %>
 <% end if can?(:create, Spree::Promotion) %>
 
 <% content_for :table_filter do %>
@@ -64,7 +64,7 @@
             <td><%= promotion.description %></td>
             <td><%= promotion.usage_limit.nil? ? "∞" : promotion.usage_limit %></td>
             <td><%= Spree.t(:current_promotion_usage, count: promotion.credits_count) %></td>
-            <td><%= promotion.expires_at.to_date.to_s(:short_date) if promotion.expires_at %></td>
+            <td><%= promotion.expires_at.strftime('%F %T %Z') if promotion.expires_at %></td>
             <td class="actions" data-hook="admin_promotions_index_row_actions">
               <span class="d-flex justify-content-end">
                <%= link_to_edit promotion, no_text: true if can?(:edit, promotion) %>

data/app/views/spree/admin/promotions/rules/_option_value.html.erb

@@ -1,7 +1,7 @@
 <div class="card-body">
   <div class="promo-rule-option-values">
     <div class="js-promo-rule-option-values"></div> <!-- display div for option value select -->
-    <button class="btn btn-primary btn-success js-add-promo-rule-option-value">
+    <button class="btn btn-primary btn-primary js-add-promo-rule-option-value">
       <%= svg_icon name: "plus-circle", width: '16', height: '16' %>
       <%= Spree.t(:add) %>
     </button>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_property), new_object_url, { class: "btn-success", icon: 'add.svg', 'data-update' => 'new_property', id: 'new_property_link' } %>
+  <%= button_link_to Spree.t(:new_property), new_object_url, { class: "btn-primary", icon: 'add.svg', 'data-update' => 'new_property', id: 'new_property_link' } %>
 <% end if can?(:create, Spree::Property) %>
 
 <% content_for :table_filter do %>

data/app/views/spree/admin/prototypes/_prototypes.html.erb

@@ -15,7 +15,7 @@
               <%= link_to_with_icon 'save.svg',
                 Spree.t(:select),
                 select_admin_prototype_url(prototype),
-                class: 'btn btn-success btn-sm ajax select_properties_from_prototype',
+                class: 'btn btn-primary btn-sm ajax select_properties_from_prototype',
                 no_text: true %>
             </span>
           </td>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_prototype), new_object_url, { class: "btn-success", icon: 'add.svg', 'data-update' => 'new_prototype', id: 'new_prototype_link'} %>
+  <%= button_link_to Spree.t(:new_prototype), new_object_url, { class: "btn-primary", icon: 'add.svg', 'data-update' => 'new_prototype', id: 'new_prototype_link'} %>
 <% end if can?(:create, Spree::Prototype) %>
 
 <% if @prototypes.any? %>

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

@@ -3,7 +3,7 @@
 <% end %>
 
 <% content_for :page_actions do %>
-  <%= button_link_to Spree.t(:new_reimbursement_type), new_object_url, { :class => "btn-success", :icon => 'add.svg', :id => 'admin_new_reimbursement_type' } %>
+  <%= button_link_to Spree.t(:new_reimbursement_type), new_object_url, { :class => "btn-primary", :icon => 'add.svg', :id => 'admin_new_reimbursement_type' } %>
 <% end if can?(:create, Spree::ReimbursementType) %>
 
 <% if @reimbursement_types.any? %>