spree_backend 4.2.4 → 4.3.0.rc3

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

@@ -24,10 +24,12 @@
             <%= 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>
+          <% if @stores.count > 1 %>
+            <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>
+          <% end %>
 
           <div data-hook="display" class="form-group">
             <%= label_tag :payment_method_display_on, Spree.t(:display) %>

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= link_to Spree.t(:payment_methods), spree.admin_payment_methods_url %> /
+  <%= link_to Spree.t(:payment_methods), spree.admin_payment_methods_path %> /
   <%= @payment_method.name %>
 <% end %>
 

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

@@ -6,6 +6,23 @@
   <%= button_link_to Spree.t(:new_payment_method), new_object_url, class: "btn-success", icon: 'add.svg', id: 'admin_new_payment_methods_link' %>
 <% end if can? :create, Spree::PaymentMethod %>
 
+<% content_for :table_filter do %>
+  <div data-hook="admin_payment_methods_filter_table">
+    <%= search_form_for [:admin, @search] do |f| %>
+      <%- locals = {f: f} %>
+      <div data-hook="admin_payment_methods_index_search" class="row">
+        <div class="form-group">
+          <%= f.label :name_cont, Spree.t('name') %>
+          <%= f.text_field :name_cont, size: 15, class: "form-control js-quick-search-target js-filterable" %>
+        </div>
+      </div>
+      <div data-hook="admin_products_index_search_buttons" class="form-actions">
+        <%= button Spree.t(:search), 'search.svg' %>
+      </div>
+    <% end %>
+  </div>
+<% end %>
+
 <% if @payment_methods.any? %>
 <div class="table-responsive">
   <table class="table sortable" id='listing_payment_methods' data-hook data-sortable-link="<%= update_positions_admin_payment_methods_url %>">
@@ -31,9 +48,11 @@
           <td><%= method.type.split('::', 3).last %></td>
           <td class="text-center"><%= Spree.t(method.display_on) %></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 %>
+          <td data-hook="admin_payment_methods_index_row_actions" class="actions">
+            <span class="d-flex justify-content-end">
+              <%= link_to_edit(method, no_text: true) if can? :edit, method %>
+              <%= link_to_delete(method, no_text: true) if can? :delete, method %>
+            </span>
           </td>
         </tr>
       <% end %>

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

@@ -1,5 +1,5 @@
 <% content_for :page_title do %>
-  <%= link_to Spree.t(:payment_methods), spree.admin_payment_methods_url %> /
+  <%= link_to Spree.t(:payment_methods), spree.admin_payment_methods_path %> /
   <%= Spree.t(:new_payment_method) %>
 <% end %>
 

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

@@ -24,14 +24,16 @@
               <%= Spree.t(payment.state, scope: :payment_states, default: payment.state.capitalize) %>
             </span>
           </td>
-          <td class="actions actions-2 text-center no-wrap">
-            <% payment.actions.each do |action| %>
-              <% if action == 'credit' %>
-                <%= link_to_with_icon('exit.svg', 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 + '.svg', 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) %>
+          <td class="actions">
+            <span class="d-flex justify-content-center payment-action-buttons">
+              <% payment.actions.each do |action| %>
+                <% if action == 'credit' %>
+                  <%= link_to_with_icon('exit.svg', 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 + '.svg', 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 %>
-            <% end %>
+            </span>
           </td>
         </tr>
       <% end %>

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

@@ -1,20 +1,13 @@
-<div class="panel-body no-padding-bottom panel-default  table-responsive">
+<div class="table-responsive">
   <div id="variant_prices-table-wrapper">
-    <table class="table sortable">
-      <colgroup>
-        <col style="width: 15%">
-        <col style="width: 30%">
-        <col style="width: 15%">
-        <col style="width: 20%">
-        <col style="width: 20%">
-      </colgroup>
+    <table class="table">
       <thead>
         <tr data-hook="variant_prices_header">
-          <th><%= Spree.t(:options) %></th>
-          <th><%= Spree.t(:sku) %></th>
-          <th><%= Spree.t(:currency) %></th>
-          <th><%= Spree.t(:price) %></th>
-          <th><%= Spree.t(:compare_at_price) %></th>
+          <th scope="col"><%= Spree.t(:options) %></th>
+          <th scope="col"><%= Spree.t(:sku) %></th>
+          <th scope="col"><%= Spree.t(:currency) %></th>
+          <th scope="col" style="min-width: 150px;"><%= Spree.t(:price) %></th>
+          <th scope="col" style="min-width: 150px;"><%= Spree.t(:compare_at_price) %></th>
         </tr>
       </thead>
       <tbody id="variant-prices" data-hook="variant_prices_body">

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

@@ -19,13 +19,15 @@
   <td class="show_property">
     <%= f.check_box :show_property %>
   </td>
-  <td class="actions actions-1">
-    <% if f.object.persisted? && can?(:destroy, f.object) %>
-      <%= 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' %>
+  <td class="actions">
+    <span class="d-flex justify-content-end">
+      <% if f.object.persisted? && can?(:destroy, f.object) %>
+        <%= 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' %>
+      </span>
+      <% end %>
     </span>
-    <% end %>
   </td>
 </tr>

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

@@ -1,5 +1,5 @@
 <script type='text/template' id='product_template'>
-  <li id="product_{{ product.id }}" data-product-id='{{ product.id }}' data-taxons="{{ product.taxon_ids }}" class="product p-2 col-6 col-md-3 col-lg-2">
+  <li id="product_{{ product.id }}" data-classification-id='{{ classification.id }}' data-product-id='{{ product.id }}' class="product p-2 col-6 col-md-3 col-lg-2">
     <div class="m-1 p-2 card bg-light">
       <nav class="navbar navbar-light bg-light justify-content-between px-0 pt-0" style="background-color:transparent !important;">
         <a class=" sort-handle js-sort-handle">
@@ -16,15 +16,19 @@
         </div>
       </nav>
       <div class='image'>
-        {{#if product.image }}
-          <img src='{{product.image}}' alt='{{ product.name }}' class='thumbnail rounded border border' />
+        {{#if image }}
+          <div class="admin-product-image-container small-img">
+            <img src='{{image}}' alt='{{ product.attributes.name }}' class='thumbnail rounded border border' />
+          </div>
         {{ else }}
-          <img src='<%= image_path("noimage/small.png") %>' alt='{{product.name }}' class='thumbnail' />
+          <div class="admin-product-image-container small-img">
+            <%= inline_svg_tag "noimage/backend-missing-image.svg", class: "noimage", size: "60%*60%" %>
+          </div>
         {{/if}}
       </div>
       <div class="p-0 pt-1 text-center product-info">
-        <p class="name card-text">{{ product.name }}</p>
-        <p class="price card-text">{{ product.display_current_currency_price }}</p>
+        <p class="name card-text">{{ product.attributes.name }}</p>
+        <p class="price card-text">{{ product.attributes.display_price }}</p>
       </div>
     </div>
   </li>

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

@@ -21,7 +21,7 @@
       <div data-hook="admin_product_form_description">
         <%= f.field_container :description, class: ['form-group'] do %>
           <%= f.label :description, Spree.t(:description) %>
-          <%= f.text_area :description, { rows: "#{unless @product.has_variants? then '20' else '13' end}", class: 'form-control' } %>
+          <%= f.text_area :description, { rows: "#{unless @product.has_variants? then '29' else '30' end}", class: "form-control #{"spree-rte" if product_wysiwyg_editor_enabled? }" } %>
           <%= f.error_message_on :description %>
         <% end %>
       </div>
@@ -31,7 +31,12 @@
       <div data-hook="admin_product_form_price">
         <%= f.field_container :price, class: ['form-group'] do %>
           <%= f.label :price, raw(Spree.t(:master_price) + required_span_tag) %>
-          <%= f.text_field :price, value: number_to_currency(@product.price, unit: ''), class: 'form-control', disabled: (cannot? :update, @product.master.default_price) %>
+          <div class="input-group">
+            <div class="input-group-prepend">
+              <span class="input-group-text"><%= currency_symbol(current_currency) %></span>
+            </div>
+            <%= f.text_field :price, value: number_to_currency(@product.amount_in(current_currency), unit: ''), class: 'form-control', disabled: (cannot? :update, @product.master.default_price) %>
+          </div>
           <%= f.error_message_on :price %>
         <% end %>
       </div>
@@ -39,7 +44,12 @@
       <div>
         <%= f.field_container :compare_at_price, class: ['form-group'] do %>
           <%= f.label :compare_at_price, Spree.t(:compare_at_price) %>
-          <%= f.text_field :compare_at_price, value: number_to_currency(@product.compare_at_price, unit: ''), class: 'form-control' %>
+          <div class="input-group">
+            <div class="input-group-prepend">
+              <span class="input-group-text"><%= currency_symbol(current_currency) %></span>
+            </div>
+            <%= f.text_field :compare_at_price, value: number_to_currency(@product.compare_at_amount_in(current_currency), unit: ''), class: 'form-control' %>
+          </div>
           <%= f.error_message_on :compare_at_price %>
         <% end %>
       </div>
@@ -194,7 +204,12 @@
       <%= f.label :taxon_ids, Spree.t(:taxons) %>
 
       <% if can? :modify, Spree::Classification %>
-        <%= f.select :taxon_ids, options_from_collection_for_select(@product.taxons, :id, :pretty_name, @product.taxons.pluck(:id)), { include_hidden: true }, multiple: true, class: 'select2-hidden-accessible' %>
+        <%= f.select :taxon_ids, options_from_collection_for_select(@product.taxons, :id, :pretty_name, @product.taxon_ids),
+                                  { include_hidden: true },
+                                    multiple: true,
+                                    data: { autocomplete_url_value: 'taxons_api_v2',
+                                            autocomplete_return_attr_value: 'pretty_name',
+                                            autocomplete_multiple_value: true } %>
       <% elsif @product.taxons.any? %>
         <ul class="text_list">
           <% @product.taxons.each do |taxon| %>
@@ -213,7 +228,13 @@
       <%= f.label :option_type_ids, Spree.t(:option_types) %>
 
       <% if can? :modify, Spree::ProductOptionType %>
-        <%= f.select :option_type_ids, options_from_collection_for_select(Spree::OptionType.all, :id, :name, @product.option_types.pluck(:id)), { include_hidden: true }, multiple: true, class: 'select2-hidden-accessible' %>
+      <%= f.select :option_type_ids, options_from_collection_for_select(@product.option_types, :id, :name, @product.option_type_ids),
+                                      { include_hidden: true },
+                                        multiple: true,
+                                        class: 'select2-hidden-accessible',
+                                        data: { autocomplete_url_value: 'option_types_api_v2',
+                                                autocomplete_return_attr_value: 'name',
+                                                autocomplete_multiple_value: true } %>
       <% elsif @product.option_types.any? %>
         <ul class="text_list">
           <% @product.option_types.each do |type| %>
@@ -227,6 +248,15 @@
     <% end %>
   </div>
 
+  <% if @stores.count > 1 %>
+    <div data-hook="admin_product_form_stores">
+      <%= f.field_container :stores, class: ['form-group'] do %>
+        <%= f.label :product_stores, Spree.t(:stores) %>
+        <%= collection_select(:product, :store_ids, @stores, :id, :unique_name, {}, { multiple: true, class: 'select2' }) %>
+      <% end %>
+    </div>
+  <% end %>
+
   <div data-hook="admin_product_form_meta">
     <div data-hook="admin_product_form_meta_title">
       <%= f.field_container :meta_title, class: ['form-group'] do %>

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

@@ -14,7 +14,7 @@
       <div data-hook="admin_products_index_search" class="row">
         <div class="col-12 col-lg-6">
           <div class="form-group">
-            <%= f.label :search_by_name, Spree.t(:name) %>
+            <%= f.label :search_by_name, Spree.t(:product_name) %>
             <%= f.text_field :search_by_name, size: 15, class: "form-control js-quick-search-target js-filterable" %>
           </div>
         </div>
@@ -25,19 +25,19 @@
           </div>
         </div>
         <div class="col-12">
-          <div class="field checkbox mb-2">
-            <label>
-              <%= f.check_box :deleted_at_null, {checked: params[:q][:deleted_at_null] == '0'}, '0', '1' %>
-              <%= Spree.t(:show_deleted) %>
-            </label>
-          </div>
+          <%= f.field_container :deleted_at_null do %>
+            <div class="custom-control custom-checkbox">
+              <%= f.check_box :deleted_at_null, {checked: params[:q][:deleted_at_null] == '0', class: 'custom-control-input'}, '0', '1' %>
+              <%= f.label :deleted_at_null, Spree.t(:show_deleted), class: 'custom-control-label' %>
+            </div>
+          <% end %>
 
-          <div class="field checkbox mb-2">
-            <label>
-              <%= f.check_box :not_discontinued, {checked: params[:q][:not_discontinued] == '0'}, '0', '1' %>
-              <%= Spree.t(:show_discontinued ) %>
-            </label>
-          </div>
+          <%= f.field_container :not_discontinued do %>
+            <div class="custom-control custom-checkbox">
+              <%= f.check_box :not_discontinued, {checked: params[:q][:not_discontinued] == '0', class: 'custom-control-input'}, '0', '1' %>
+              <%= f.label :not_discontinued, Spree.t(:show_discontinued ), class: 'custom-control-label' %>
+            </div>
+          <% end %>
         </div>
       </div>
       <div data-hook="admin_products_index_search_buttons" class="form-actions">
@@ -68,13 +68,14 @@
           <tr <%== "style='color: red;'" if product.deleted? %> id="<%= spree_dom_id product %>" data-hook="admin_products_index_rows" class="<%= cycle('odd', 'even') %>">
             <td scope="row" class="image">
               <%= link_to edit_admin_product_path(product) do %>
-                <%= mini_image product %>
+                <%= small_image product %>
               <% end %>
             </td>
             <td><%= link_to product.try(:name), edit_admin_product_path(product) %></td>
             <td class="sku"><%= product.sku rescue '' %></td>
             <td class="status"><%= active_badge(available_status == Spree.t(:available), label: available_status) %></td>
             <td class="text-center"><%= display_price(product) %></td>
+
             <td class="actions " data-hook="admin_products_index_row_actions">
               <span class="d-flex justify-content-end">
                 <%= link_to_edit product, no_text: true, class: 'edit' if can?(:edit, product) && !product.deleted? %>

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

@@ -33,8 +33,13 @@
 
       <div data-hook="new_product_price" class="col-12 col-md-4">
         <%= f.field_container :price, class: ['form-group'] do %>
-          <%= f.label :price, Spree.t(:master_price) %> <span class="required">*</span>
+        <%= f.label :price, Spree.t(:master_price) %> <span class="required">*</span>
+        <div class="input-group">
+          <div class="input-group-prepend">
+            <span class="input-group-text"><%= currency_symbol(current_currency) %></span>
+          </div>
           <%= f.text_field :price, value: number_to_currency(@product.price, unit: ''), class: 'form-control', required: :required %>
+        </div>
           <%= f.error_message_on :price %>
         <% end %>
       </div>

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

@@ -6,73 +6,76 @@
     <%= render 'add_stock_form' %>
   </div>
 <% end %>
-
-<div class="card mb-3 table-responsive">
-  <table class="table" id="listing_product_stock">
-    <thead>
-      <tr data-hook="admin_product_stock_management_index_headers">
-        <th colspan="2"><%= Spree.t(:variant) %></th>
-        <th colspan="3"><%= Spree.t(:stock_location_info) %></th>
-      </tr>
-    </thead>
-    <tbody>
-      <% @variants.each do |variant| %>
-        <% if variant.stock_items.present? %>
-          <tr id="<%= spree_dom_id variant %>" data-hook="admin_product_stock_management_index_rows">
-            <td class="image text-center">
-              <% if variant.images.present? %>
-                <%= image_tag main_app.url_for(variant.images.first.url(:mini)) %>
-              <% end %>
-            </td>
-            <td>
-              <%= variant.sku_and_options_text %>
-              <%= form_tag admin_product_variants_including_master_path(@product, variant, format: :js), method: :put, class: 'toggle_variant_track_inventory' do %>
-                <div class="checkbox">
-                  <%= label_tag "track_inventory_#{ variant.id }" do %>
-                    <%= check_box_tag 'track_inventory', 1, variant.track_inventory?,
-                                      class: 'track_inventory_checkbox', id: "track_inventory_#{ variant.id }" %>
-                    <%= Spree.t(:track_inventory) %>
-                    <%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?,
-      class: 'variant_track_inventory',
-      id: "variant_track_inventory_#{variant.id}" %>
-                  <% end %>
-                </div>
-              <% end if can?(:update, @product) && can?(:update, variant) %>
-            </td>
-
-            <td colspan="3" class="stock_location_info">
-              <table class="table table-bordered mb-0">
-                <thead>
-                  <th><%= Spree.t(:stock_location) %></th>
-                  <th class="text-center"><%= Spree.t(:count_on_hand) %></th>
-                  <th class="text-center"><%= Spree.t(:backorderable) %></th>
-                  <th class="actions text-center"></th>
-                </thead>
-                <tbody>
-                  <% variant.stock_items.each do |item| %>
-                    <% next unless @stock_locations.include?(item.stock_location) %>
-                    <tr id="stock-item-<%= item.id %>">
-                      <td><%= item.stock_location.name %></td>
-                      <td class="text-center"><%= item.count_on_hand %></td>
-                      <td class="text-center">
-                        <%= form_tag admin_stock_item_path(item), method: :put, class: 'toggle_stock_item_backorderable' do %>
-                          <%= check_box_tag 'stock_item[backorderable]', true,
-                                item.backorderable?,
-                                class: 'stock_item_backorderable',
-                                id: "stock_item_backorderable_#{item.stock_location.id}" %>
-                        <% end if can? :update, item %>
-                      </td>
-                      <td class="actions actions-1 text-center">
-                        <%= link_to_with_icon('delete.svg', Spree.t(:remove), [:admin, item], method: :delete, remote: true, class: 'icon_link btn btn-danger btn-sm', data: { action: :remove, confirm: Spree.t(:are_you_sure) }, no_text: true) if can? :destroy, item %>
-                      </td>
-                    </tr>
-                  <% end %>
-                </tbody>
-              </table>
-            </td>
-          <% end %>
+<div class="card mb-3">
+  <div class="table-responsive">
+    <table class="table" id="listing_product_stock">
+      <thead>
+        <tr data-hook="admin_product_stock_management_index_headers">
+          <th colspan="2"><%= Spree.t(:variant) %></th>
+          <th colspan="3"><%= Spree.t(:stock_location_info) %></th>
         </tr>
-      <% end %>
-    </tbody>
-  </table>
+      </thead>
+      <tbody>
+        <% @variants.each do |variant| %>
+          <% if variant.stock_items.present? %>
+            <tr id="<%= spree_dom_id variant %>" data-hook="admin_product_stock_management_index_rows">
+              <td class="image text-center">
+                <% if variant.images.present? %>
+                  <%= image_tag main_app.url_for(variant.images.first.url(:mini)) %>
+                <% end %>
+              </td>
+              <td>
+                <%= variant.sku_and_options_text %>
+                <%= form_tag admin_product_variants_including_master_path(@product, variant, format: :js), method: :put, class: 'toggle_variant_track_inventory' do %>
+                  <div class="checkbox">
+                    <%= label_tag "track_inventory_#{ variant.id }" do %>
+                      <%= check_box_tag 'track_inventory', 1, variant.track_inventory?,
+                                        class: 'track_inventory_checkbox', id: "track_inventory_#{ variant.id }" %>
+                      <%= Spree.t(:track_inventory) %>
+                      <%= hidden_field_tag 'variant[track_inventory]', variant.track_inventory?,
+        class: 'variant_track_inventory',
+        id: "variant_track_inventory_#{variant.id}" %>
+                    <% end %>
+                  </div>
+                <% end if can?(:update, @product) && can?(:update, variant) %>
+              </td>
+
+              <td colspan="3" class="stock_location_info">
+                <table class="table table-bordered mb-0">
+                  <thead>
+                    <th><%= Spree.t(:stock_location) %></th>
+                    <th class="text-center"><%= Spree.t(:count_on_hand) %></th>
+                    <th class="text-center"><%= Spree.t(:backorderable) %></th>
+                    <th class="actions text-center"></th>
+                  </thead>
+                  <tbody>
+                    <% variant.stock_items.each do |item| %>
+                      <% next unless @stock_locations.include?(item.stock_location) %>
+                      <tr id="stock-item-<%= item.id %>">
+                        <td><%= item.stock_location.name %></td>
+                        <td class="text-center"><%= item.count_on_hand %></td>
+                        <td class="text-center">
+                          <%= form_tag admin_stock_item_path(item), method: :put, class: 'toggle_stock_item_backorderable' do %>
+                            <%= check_box_tag 'stock_item[backorderable]', true,
+                                  item.backorderable?,
+                                  class: 'stock_item_backorderable',
+                                  id: "stock_item_backorderable_#{item.stock_location.id}" %>
+                          <% end if can? :update, item %>
+                        </td>
+                        <td class="actions">
+                          <span class="d-flex justify-content-center">
+                            <%= link_to_with_icon('delete.svg', Spree.t(:remove), [:admin, item], method: :delete, remote: true, class: 'icon_link btn btn-danger btn-sm', data: { action: :remove, confirm: Spree.t(:are_you_sure) }, no_text: true) if can? :destroy, item %>
+                          </span>
+                        </td>
+                      </tr>
+                    <% end %>
+                  </tbody>
+                </table>
+              </td>
+            <% end %>
+          </tr>
+        <% end %>
+      </tbody>
+    </table>
+  </div>
 </div>