solidus_backend 2.9.6 → 2.11.0

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

@@ -1,8 +1,7 @@
-<table class="index return-items-table">
+<table class="index return-items-table selectable-table">
   <thead>
     <tr>
       <th>
-        <%= check_box_tag 'select-all' %>
       </th>
       <th><%= Spree::Product.model_name.human %></th>
       <th><%= Spree::Variant.human_attribute_name(:sku) %></th>
@@ -25,7 +24,7 @@
             <%= item_fields.hidden_field :return_authorization_id %>
             <%= item_fields.hidden_field :amount %>
           </div>
-          <%= item_fields.check_box :returned, {checked: false, class: 'add-item', "data-price" => return_item.amount}, '1', '0' %>
+          <%= item_fields.check_box :returned, {checked: false, class: 'selectable add-item', "data-price" => return_item.amount}, '1', '0' %>
         </td>
         <td>
           <div class="variant-name"><%= return_item.inventory_unit.variant.name %></div>

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

@@ -40,7 +40,7 @@
       </div>
 
       <div class="form-buttons filter-actions actions" data-hook="buttons">
-        <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
+        <%= f.submit t('spree.actions.create'), class: 'btn btn-primary' %>
         <%= link_to t('spree.actions.cancel'), admin_order_customer_returns_url(@order), class: 'btn btn-primary' %>
       </div>
     </fieldset>

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

@@ -5,7 +5,9 @@
 
 <% content_for :page_actions do %>
   <% if can?(:create, Spree::Image) %>
-    <li><%= link_to_with_icon('plus', t('spree.new_image'), new_admin_product_image_url(@product), id: 'new_image_link', class: 'btn btn-primary') %></li>
+    <li>
+      <%= link_to t('spree.new_image'), new_admin_product_image_url(@product), id: 'new_image_link', class: 'btn btn-primary' %>
+    </li>
   <% end %>
 <% end %>
 
@@ -13,29 +15,31 @@
   <%= render 'new', product: @product, image: Spree::Image.new(viewable: @product) %>
 </div>
 
-<fieldset class="no-border-bottom">
-  <legend align="center"><%= t(".upload_images") %></legend>
+<% if can?(:create, Spree::Image) %>
+  <fieldset class="no-border-bottom">
+    <legend align="center"><%= t(".upload_images") %></legend>
 
-  <div id="upload-zone">
-    <%= form_for [:admin, @product, Spree::Image.new],
-        html: { multipart: true, id: 'upload-form' } do |f| %>
-      <label class="upload">
-        <i class="fa fa-5x fa-cloud-upload"></i>
-        <p>
-          <span class="button"><%= t(".choose_files") %></span>
-        </p>
-        <p>
-          <%= t(".drag_and_drop") %>
-        </p>
+    <div id="upload-zone">
+      <%= form_for [:admin, @product, Spree::Image.new],
+          html: { multipart: true, id: 'upload-form' } do |f| %>
+        <label class="upload">
+          <i class="fa fa-5x fa-cloud-upload"></i>
+          <p>
+            <span class="button"><%= t(".choose_files") %></span>
+          </p>
+          <p>
+            <%= t(".drag_and_drop") %>
+          </p>
 
-        <%= f.file_field :attachment, multiple: '', class: 'hidden' %>
-        <%= f.hidden_field :viewable_id, value: @product.master.id %>
-      </label>
-    <% end %>
-  </div>
+          <%= f.file_field :attachment, multiple: '', class: 'hidden' %>
+          <%= f.hidden_field :viewable_id, value: @product.master.id %>
+        </label>
+      <% end %>
+    </div>
 
-  <div id="progress-zone" class="row"></div>
-</fieldset>
+    <div id="progress-zone" class="row"></div>
+  </fieldset>
+<% end %>
 
 <% no_images = @product.gallery.images.empty? %>
 

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

@@ -7,5 +7,12 @@
   </td>
   <td class="name"><%= f.text_field :name %></td>
   <td class="presentation"><%= f.text_field :presentation %></td>
-  <td class="actions"><%= link_to_remove_fields t('spree.actions.remove'), f, no_text: true %></td>
+  <td class="actions">
+    <% if f.object.persisted? %>
+      <%= link_to_delete f.object, no_text: true %>
+    <% else %>
+      <%= link_to_with_icon('trash', 'remove', '#', no_text: true, class: "spree_remove_fields",
+            data: { action: 'remove' }, title: t('spree.actions.remove')) %>
+    <% end %>
+  </td>
 </tr>

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

@@ -6,10 +6,12 @@
 <% content_for :page_actions do %>
   <li>
     <span id="new_add_option_value" data-hook>
-      <%= link_to_add_fields t('spree.add_option_value'), "tbody#option_values", class: 'btn btn-primary' %>
+      <%= button_tag t('spree.add_option_value'), type: 'button',
+            data: { target: 'tbody#option_values' },
+            class: 'btn btn-primary spree_add_fields' %>
     </span>
   </li>
-  <% end %>
+<% end %>
 
 <%= render partial: 'spree/shared/error_messages', locals: { target: @option_type } %>
 

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

@@ -7,6 +7,7 @@
 
   <% if can?(:update, @order) && can?(:create, Spree::LineItem) %>
     <button class="js-add-line-item btn btn-primary" disabled><%= t('spree.add_line_item') %></button>
+    <button class="js-empty-cart btn btn-primary" disabled><%= t('spree.empty_cart') %></button>
   <% end %>
 
   <%= render "spree/admin/orders/order_details", { order: order } %>

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

@@ -41,6 +41,19 @@
   </fieldset>
 
   <div class="row">
+    <% if Spree::Config[:order_bill_address_used] %>
+      <div class="col-6" data-hook="bill_address_wrapper">
+        <fieldset class="no-border-bottom">
+          <legend align="center"><%= t('spree.billing_address') %></legend>
+          <div class="js-billing-address">
+            <%= f.fields_for :bill_address do |ba_form| %>
+              <%= render partial: 'spree/admin/shared/address_form', locals: { f: ba_form, type: "billing" } %>
+            <% end %>
+          </div>
+        </fieldset>
+      </div>
+    <% end %>
+
     <div class="col-6" data-hook="ship_address_wrapper">
       <fieldset class="no-border-bottom">
         <legend align="center"><%= t('spree.shipping_address') %></legend>
@@ -62,19 +75,6 @@
         </div>
       </fieldset>
     </div>
-
-    <% if Spree::Config[:order_bill_address_used] %>
-      <div class="col-6" data-hook="bill_address_wrapper">
-        <fieldset class="no-border-bottom">
-          <legend align="center"><%= t('spree.billing_address') %></legend>
-          <div class="js-billing-address">
-            <%= f.fields_for :bill_address do |ba_form| %>
-              <%= render partial: 'spree/admin/shared/address_form', locals: { f: ba_form, type: "billing" } %>
-            <% end %>
-          </div>
-        </fieldset>
-      </div>
-    <% end %>
   </div>
 
   <div class="clear"></div>

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

@@ -18,13 +18,12 @@
   <%= render 'spree/admin/orders/risk_analysis', latest_payment: @order.payments.reorder("created_at DESC").first %>
 <% end %>
 
-<% if can?(:update, Spree::Shipment) && can?(:update, @order) && @order.shipment_state != "shipped" %>
-  <%= render partial: 'add_product' %>
-<% end %>
+<div data-hook="admin_order_edit_sub_header"></div>
 
 <% if @order.line_items.empty? %>
   <div class="no-objects-found">
-    <%= t('spree.your_order_is_empty_add_product')%>
+    <p><%= t('spree.your_order_is_empty_add_product') %></p>
+    <%= link_to t('spree.cart'), spree.cart_admin_order_url(@order), class: 'btn btn-primary' %>
   </div>
 <% end %>
 

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

@@ -7,7 +7,7 @@
   <li>
     <%= link_to t('spree.new_order'), new_admin_order_url, id: 'admin_new_order', class: 'btn btn-primary' %>
   </li>
-<% end if can? :create, Spree::Order %>
+<% end if can? :manage, Spree::Order %>
 
 <% content_for :table_filter_title do %>
   <%= t('spree.filter') %>
@@ -65,14 +65,21 @@
             </div>
 
             <div class="col-12 col-xl-6">
-              <div class="field">
-                <%= label_tag :q_bill_address_firstname_start, t('spree.first_name_begins_with') %>
-                <%= f.text_field :bill_address_firstname_start, size: 25 %>
-              </div>
-              <div class="field">
-                <%= label_tag :q_bill_address_lastname_start, t('spree.last_name_begins_with') %>
-                <%= f.text_field :bill_address_lastname_start, size: 25%>
-              </div>
+              <% if Spree::Config.use_combined_first_and_last_name_in_address %>
+                <div class="field">
+                  <%= label_tag :q_bill_address_firstname_or_lastname_start, t('spree.name_contains') %>
+                  <%= f.text_field :bill_address_firstname_or_lastname_start, size: 25 %>
+                </div>
+              <% else %>
+                <div class="field">
+                  <%= label_tag :q_bill_address_firstname_start, t('spree.first_name_begins_with') %>
+                  <%= f.text_field :bill_address_firstname_start, size: 25 %>
+                </div>
+                <div class="field">
+                  <%= label_tag :q_bill_address_lastname_start, t('spree.last_name_begins_with') %>
+                  <%= f.text_field :bill_address_lastname_start, size: 25 %>
+                </div>
+              <% end %>
             </div>
 
             <div class="col-12 col-xl-6">
@@ -177,8 +184,9 @@
           <% if order.user %>
             <%= link_to order.email, edit_admin_user_path(order.user) %>
           <% else %>
-            <%= mail_to order.email %>
+            <%= order.email %>
           <% end %>
+          <%= link_to_with_icon('email', t('spree.actions.send_email'), "mailto:#{order.email}", no_text: true) %>
         </td>
         <td class="align-right"><%= order.display_total.to_html %></td>
         <td class='actions align-center' data-hook="admin_orders_index_row_actions">
@@ -190,9 +198,11 @@
   </table>
 <% else %>
   <div class="no-objects-found">
-    <%= render 'spree/admin/shared/no_objects_found',
-                 resource: Spree::Order,
-                 new_resource_url: spree.new_admin_order_path %>
+    <% if can? :manage, Spree::Order %>
+      <%= render 'spree/admin/shared/no_objects_found',
+                   resource: Spree::Order,
+                   new_resource_url: spree.new_admin_order_path %>
+    <% end %>
   </div>
 <% end %>
 

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

@@ -31,7 +31,12 @@
         </div>
         <div data-hook="auto_capture" class="field">
           <%= f.label :auto_capture %>
-          <%= f.select :auto_capture, [["#{t('spree.use_app_default')} (#{Spree::Config[:auto_capture]})", ''], [t('spree.say_yes'), true], [t('spree.say_no'), false]], {}, {class: 'custom-select fullwidth'} %>
+          <%= f.select :auto_capture,
+            [["#{t('spree.use_app_default')} (#{Spree::Config[:auto_capture] ? t('spree.say_yes') : t('spree.say_no')})", ''],
+             [t('spree.say_yes'), true],
+             [t('spree.say_no'), false]],
+          {},
+          {class: 'custom-select fullwidth'} %>
         </div>
         <div data-hook="available_to_user" class="field">
           <label>
@@ -39,7 +44,7 @@
             <%= Spree::PaymentMethod.human_attribute_name :available_to_users %>
           </label>
         </div>
-        <div data-hook="available_to_user" class="field">
+        <div data-hook="available_to_admin" class="field">
           <label>
             <%= f.check_box :available_to_admin %>
             <%= Spree::PaymentMethod.human_attribute_name :available_to_admin %>

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

@@ -15,7 +15,7 @@
   <fieldset class="no-border-top">
     <%= render partial: 'form', locals: { f: f } %>
     <div data-hook="buttons" class="filter-actions actions">
-      <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
+      <%= f.submit t('spree.actions.create'), class: 'btn btn-primary' %>
     </div>
   </fieldset>
 <% end %>

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

@@ -3,7 +3,9 @@
 <% content_for :page_actions do %>
   <% if @order.outstanding_balance? %>
     <li id="new_payment_section">
-      <%= link_to t('spree.new_payment'), new_admin_order_payment_url(@order), class: 'btn btn-primary' %>
+      <% if can? :create, Spree::Payment %>
+        <%= link_to t('spree.new_payment'), new_admin_order_payment_url(@order), class: 'btn btn-primary' %>
+      <% end %>
     </li>
   <% end %>
 <% end %>

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

@@ -1,41 +1,41 @@
-<div class="row">
-  <div class="col-12">
-    <fieldset class="no-border-bottom <%= "no-border-top" if !variants %>">
-      <% if variants %>
-        <legend align="center"><%= I18n.t(:master_variant, scope: :spree) %> <%= admin_hint I18n.t(:master_variant, scope: :spree), I18n.t(:master_variant, scope: [:spree, :hints, "spree/price"]) %></legend>
-      <% end %>
-      <table class="index master_prices">
-        <colgroup>
-          <col style="width: 30%">
-          <col style="width: 30%">
-          <col style="width: 20%">
-          <col style="width: 20%">
-        </colgroup>
-        <thead data-hook="master_prices_header">
-          <tr>
-            <th><%= Spree::Price.human_attribute_name(:country) %></th>
-            <th><%= Spree::Price.human_attribute_name(:currency) %></th>
-            <th><%= Spree::Price.human_attribute_name(:amount) %></th>
-            <th class="actions"></th>
-          </tr>
-        </thead>
-        <% master_prices.each do |price| %>
-          <tr id="<%= spree_dom_id price %>" data-hook="prices_row" class="<%= "deleted" if price.deleted? %>">
-            <td><%= price.display_country %></td>
-            <td><%= price.currency %></td>
-            <td><%= price.money.to_html %></td>
-            <td class="actions">
-              <% if can?(:update, price) %>
-                <%= link_to_edit(price, no_text: true) unless price.deleted? %>
-              <% end %>
-              <% if can?(:destroy, price) %>
-                &nbsp;
-                <%= link_to_delete(price, no_text: true) unless price.deleted? %>
-              <% end %>
-            </td>
-          </tr>
-        <% end %>
-      </table>
-    </fieldset>
-  </div>
-</div>
+<%= paginate master_prices, theme: "solidus_admin" %>
+
+<fieldset class="no-border-bottom <%= "no-border-top" if !variants %>">
+  <% if variants %>
+    <legend align="center"><%= I18n.t(:master_variant, scope: :spree) %> <%= admin_hint I18n.t(:master_variant, scope: :spree), I18n.t(:master_variant, scope: [:spree, :hints, "spree/price"]) %></legend>
+  <% end %>
+  <table class="index master_prices">
+    <colgroup>
+      <col style="width: 30%">
+      <col style="width: 30%">
+      <col style="width: 20%">
+      <col style="width: 20%">
+    </colgroup>
+    <thead data-hook="master_prices_header">
+      <tr>
+        <th><%= Spree::Price.human_attribute_name(:country) %></th>
+        <th><%= Spree::Price.human_attribute_name(:currency) %></th>
+        <th><%= Spree::Price.human_attribute_name(:amount) %></th>
+        <th class="actions"></th>
+      </tr>
+    </thead>
+    <% master_prices.each do |price| %>
+      <tr id="<%= spree_dom_id price %>" data-hook="prices_row" class="<%= "deleted" if price.discarded? %>">
+        <td><%= price.display_country %></td>
+        <td><%= price.currency %></td>
+        <td><%= price.money.to_html %></td>
+        <td class="actions">
+          <% if can?(:update, price) %>
+            <%= link_to_edit(price, no_text: true) unless price.discarded? %>
+          <% end %>
+          <% if can?(:destroy, price) %>
+            &nbsp;
+            <%= link_to_delete(price, no_text: true) unless price.discarded? %>
+          <% end %>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+</fieldset>
+
+<%= paginate master_prices, theme: "solidus_admin" %>

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

@@ -14,18 +14,18 @@
     </thead>
     <tbody>
       <% variant_prices.each do |price| %>
-        <tr id="<%= spree_dom_id price %>" data-hook="prices_row" class="<%= "deleted" if price.deleted? %>">
+        <tr id="<%= spree_dom_id price %>" data-hook="prices_row" class="<%= "deleted" if price.discarded? %>">
           <td><%= price.variant.descriptive_name %></td>
           <td><%= price.display_country %></td>
           <td><%= price.currency %></td>
           <td><%= price.money.to_html %></td>
           <td class="actions">
             <% if can?(:update, price) %>
-              <%= link_to_edit(price, no_text: true) unless price.deleted? %>
+              <%= link_to_edit(price, no_text: true) unless price.discarded? %>
             <% end %>
             <% if can?(:destroy, price) %>
               &nbsp;
-              <%= link_to_delete(price, no_text: true) unless price.deleted? %>
+              <%= link_to_delete(price, no_text: true) unless price.discarded? %>
             <% end %>
           </td>
         </tr>

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

@@ -12,8 +12,13 @@
     <%= f.text_field :value %>
   </td>
   <td class="actions">
-    <% if f.object.persisted? && can?(:destroy, f.object) %>
-      <%= link_to_delete f.object, no_text: true %>
+    <% if f.object.persisted? %>
+      <% if can?(:destroy, f.object) %>
+        <%= link_to_delete f.object, no_text: true %>
+      <% end %>
+    <% else %>
+      <%= link_to_with_icon('trash', 'remove', '#', no_text: true, class: "spree_remove_fields",
+            data: { action: 'remove' }, title: t('spree.actions.remove')) %>
     <% end %>
   </td>
 </tr>

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

@@ -7,7 +7,9 @@
   <% if can?(:create, Spree::ProductProperty) %>
     <ul class="tollbar inline-menu">
       <li>
-        <%= link_to_add_fields t('spree.add_product_properties'), 'tbody#product_properties', class: 'plus btn btn-primary' %>
+        <%= button_tag t('spree.add_product_properties'), type: 'button',
+              data: { target: 'tbody#product_properties' },
+              class: 'btn btn-primary spree_add_fields' %>
       </li>
     </ul>
   <% end %>
@@ -55,7 +57,9 @@
       <div class="form-buttons filter-actions actions">
         <%= button_tag t('spree.filter_results'), class: 'btn btn-primary' %>
         <% if @option_value_ids.present? %>
-          <%= link_to_add_fields t('spree.add_variant_properties'), 'tbody#variant_property_values', class: 'plus button' %>
+          <%= button_tag t('spree.add_variant_properties'), type: 'button',
+                data: { target: 'tbody#variant_property_values' },
+                class: 'button spree_add_fields' %>
         <% end %>
       </div>
     </fieldset>
@@ -66,6 +70,14 @@
   <%= f.fields_for :variant_property_rules, @variant_property_rule do |rule_form| %>
     <%= rule_form.hidden_field 'id', value: @variant_property_rule.id %>
     <%= rule_form.hidden_field 'option_value_ids', value: @option_value_ids.join(',') %>
+    <div class="col-12">
+      <div class="field checkbox">
+        <label>
+          <%= rule_form.check_box 'apply_to_all', value: @variant_property_rule.apply_to_all %>
+          <%= t('spree.applies_to_all_variant_properties') %>
+        </label>
+      </div>
+    </div>
     <% if @option_value_ids.present? %>
       <fieldset class='no-border-top'>
         <table class="index sortable" data-hook data-sortable-link="<%= update_positions_admin_product_variant_property_rule_values_url %>">