solidus_backend 2.10.5 → 2.11.0

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/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

@@ -20,17 +20,17 @@
       </tr>
     </thead>
     <% master_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.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/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 %>">

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

@@ -83,6 +83,17 @@
         <% end %>
       </div>
 
+      <div data-hook="admin_product_form_discontinue_on">
+        <%= f.field_container :discontinue_on do %>
+          <%= f.label :discontinue_on %>
+          <%= f.field_hint :discontinue_on %>
+
+          <%= render "spree/admin/shared/datepicker", f: f, date_attr: :discontinue_on %>
+
+          <%= f.error_message_on :discontinue_on %>
+        <% end %>
+      </div>
+
       <div data-hook="admin_product_form_promotionable">
         <%= f.field_container :promotionable do %>
           <label>
@@ -146,8 +157,8 @@
       <div data-hook="admin_product_form_tax_category">
         <%= f.field_container :tax_category do %>
           <%= f.label :tax_category_id, Spree::TaxCategory.model_name.human %>
-          <%= f.field_hint :tax_category %>
-          <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: t('spree.match_choices.none') }, { class: 'custom-select' }) %>
+          <%= f.field_hint :tax_category, default_tax_category: @default_tax_category&.name %>
+          <%= f.collection_select(:tax_category_id, @tax_categories, :id, :name, { include_blank: t('spree.match_choices.none'), selected: @default_tax_category&.id }, { class: 'custom-select' }) %>
           <%= f.error_message_on :tax_category %>
         <% end %>
       </div>

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

@@ -34,7 +34,7 @@
           <div class="col-2">
             <div class="field checkbox">
               <label>
-                <%= f.check_box :with_deleted, { checked: params[:q][:with_deleted] == 'true' }, 'true', 'false' %>
+                <%= f.check_box :with_discarded, { checked: params[:q][:with_discarded] == 'true' }, 'true', 'false' %>
                 <%= t('spree.show_deleted') %>
               </label>
             </div>

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

@@ -4,7 +4,7 @@
 
 <% content_for :page_actions do %>
   <li>
-    <% if can?(:create, Spree::PromotionCode) %>
+    <% if can?(:create, Spree::PromotionCode) && !@promotion.apply_automatically? %>
       <%= link_to t('spree.create_promotion_code'), new_admin_promotion_promotion_code_path(promotion_id: @promotion.id), class: 'btn btn-primary' %>
     <% end %>
 

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

@@ -8,7 +8,7 @@
         <div class="field">
           <%= label_tag :action_type, t('spree.adjustment_type')%>
           <%= admin_hint t('spree.adjustment_type'), t(:promotions, scope: [:spree, :hints, "spree/calculator"]) %>
-          <%= select_tag 'action_type', options, include_blank: t(:choose_promotion_action, scope: 'spree'), class: 'custom-select fullwidth' %>
+          <%= select_tag 'action_type', options, include_blank: t(:choose_promotion_action, scope: 'spree'), class: 'custom-select fullwidth', required: true %>
         </div>
         <div class="filter-actions actions">
           <%= button_tag t('spree.actions.add'), class: 'btn btn-primary' %>

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

@@ -4,7 +4,7 @@
     <div class="form-check">
       <label class="form-check-label">
         <%= radio_button_tag('activation_type', 'auto', activation_type == 'auto') %>
-        <%= t('.auto') %>
+        <%= t('.auto') %> <%= f.field_hint :promo_code_will_be_disabled %>
       </label>
     </div>
     <div class="form-check">

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

@@ -7,7 +7,7 @@
       <% if can?(:update, @promotion) %>
         <div class="field">
           <%= label_tag :promotion_rule_type, t('spree.discount_rules') %>
-          <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), include_blank: t(:choose_promotion_rule, scope: 'spree'), class: 'custom-select fullwidth') %>
+          <%= select_tag('promotion_rule[type]', options_for_promotion_rule_types(@promotion), include_blank: t(:choose_promotion_rule, scope: 'spree'), class: 'custom-select fullwidth', required: true) %>
         </div>
         <div class="filter-actions actions">
           <%= button_tag t('spree.actions.add'), class: 'btn btn-primary' %>

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

@@ -5,13 +5,13 @@
 
 <% content_for :page_actions do %>
   <li>
-    <% if can?(:display, Spree::PromotionCode) %>
+    <% if can?(:show, Spree::PromotionCode) %>
       <%= link_to t('spree.view_promotion_codes_list'), admin_promotion_promotion_codes_path(promotion_id: @promotion.id), class: 'btn btn-primary' %>
 
       <%= link_to t('spree.download_promotion_codes_list'), admin_promotion_promotion_codes_path(promotion_id: @promotion.id, format: :csv), class: 'btn btn-primary' %>
     <% end %>
 
-    <% if can?(:display, Spree::PromotionCodeBatch) %>
+    <% if can?(:show, Spree::PromotionCodeBatch) %>
       <%= link_to plural_resource_name(Spree::PromotionCodeBatch), admin_promotion_promotion_code_batches_path(promotion_id: @promotion.id), class: 'btn btn-primary' %>
     <% end %>
   </li>

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

@@ -16,33 +16,40 @@
   <div data-hook="admin_promotions_index_search">
     <%= search_form_for [:admin, @search] do |f| %>
       <div class="row">
-        <div class="col-3">
+        <div class="col-4">
           <div class="field">
             <%= label_tag :q_name_cont, Spree::Promotion.human_attribute_name(:name) %>
             <%= f.text_field :name_cont, tabindex: 1 %>
           </div>
         </div>
 
-        <div class="col-3">
+        <div class="col-2">
           <div class="field">
             <%= label_tag :q_codes_value_cont, Spree::Promotion.human_attribute_name(:code) %>
             <%= f.text_field :codes_value_cont, tabindex: 1 %>
           </div>
         </div>
 
-        <div class="col-3">
+        <div class="col-2">
           <div class="field">
             <%= label_tag :q_path_cont, Spree::Promotion.human_attribute_name(:path) %>
             <%= f.text_field :path_cont, tabindex: 1 %>
           </div>
         </div>
 
-        <div class="col-3">
+        <div class="col-2">
           <div class="field">
             <%= label_tag :q_promotion_category_id_eq, Spree::PromotionCategory.model_name.human %><br>
             <%= f.collection_select(:promotion_category_id_eq, @promotion_categories, :id, :name, { include_blank: t('spree.match_choices.all') }, { class: 'custom-select fullwidth' }) %>
           </div>
         </div>
+
+        <div class="col-2">
+          <div class="field">
+            <%= label_tag :active, t('spree.active') %><br>
+            <%= f.check_box :active, label: false, as: :boolean, checked_value: true %>
+          </div>
+        </div>
       </div>
 
       <div class="clearfix"></div>
@@ -59,7 +66,7 @@
 
 <%= paginate @promotions, theme: "solidus_admin" %>
 
-<% if @promotions.any? %>
+<% if @promotions.length > 0 %>
   <table class="index">
     <thead>
       <tr>

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

@@ -1,13 +1,10 @@
 <% allow_return_item_changes = !@return_authorization.customer_returned_items? %>
 
 <div data-hook="admin_return_authorization_form_fields">
-  <table class="index return-items-table">
+  <table class="index return-items-table selectable-table">
     <thead>
       <tr data-hook="rma_header">
-        <th class="return-item-checkbox">
-          <% if allow_return_item_changes %>
-            <%= check_box_tag 'select-all' %>
-          <% end %>
+        <th>
         </th>
         <th class="return-item-product"><%= Spree::Product.model_name.human %></th>
         <th class="return-item-state"><%= Spree::ReturnAuthorization.human_attribute_name(:state) %></th>
@@ -27,7 +24,7 @@
           <td class="return-item-checkbox inventory-unit-checkbox">
             <% if editable %>
               <%= item_fields.hidden_field :inventory_unit_id %>
-              <%= item_fields.check_box :_destroy, {checked: return_item.persisted?, class: 'add-item', "data-price" => return_item.amount}, '0', '1' %>
+              <%= item_fields.check_box :_destroy, {checked: return_item.persisted?, class: 'selectable add-item', "data-price" => return_item.amount}, '0', '1' %>
             <% end %>
           </td>
           <td class="return-item-product">
@@ -75,10 +72,6 @@
     </tbody>
   </table>
 
-  <%= f.field_container :amount do %>
-    <%= t('spree.total_pre_tax_refund') %>: <span id="total_pre_tax_refund">0.00</span>
-  <% end %>
-
   <%= f.field_container :stock_location do %>
     <%= f.label :stock_location_id, Spree::StockLocation.model_name.human %>
     <%= f.select :stock_location_id, @stock_locations.to_a.collect{|l|[l.name, l.id]}, {include_blank: true}, {class: 'custom-select fullwidth', "data-placeholder" => t('spree.select_a_stock_location')} %>

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

@@ -3,7 +3,7 @@
 <% content_for :page_actions do %>
   <% if @order.shipments.any? &:shipped? %>
     <li>
-      <% if can? :create, Spree::ReturnAuthorization %>
+      <% if can? :manage, Spree::ReturnAuthorization %>
         <%= link_to t('spree.new_return_authorization'), new_admin_order_return_authorization_url(@order), class: 'btn btn-primary' %>
       <% end %>
     </li>

data/app/views/spree/admin/search/users.json.jbuilder

@@ -4,7 +4,21 @@ json.array!(@users) do |user|
   json.id user.id
   json.email user.email
 
-  address_fields = [:firstname, :lastname, :address1, :address2, :city, :zipcode, :phone, :state_name, :state_id, :country_id, :company]
+  address_fields = [
+    :name,
+    :address1,
+    :address2,
+    :city,
+    :zipcode,
+    :phone,
+    :state_name,
+    :state_id,
+    :country_id,
+    :company
+  ]
+  unless Spree::Config.use_combined_first_and_last_name_in_address
+    address_fields.push(:firstname, :lastname)
+  end
   json.ship_address do
     if user.ship_address
       json.(user.ship_address, *address_fields)

data/app/views/spree/admin/shared/_address.html.erb

@@ -1,8 +1,8 @@
 <div data-hook="address">
-  <%="#{address.firstname} #{address.lastname} "%><%= address.company unless address.company.blank? %><br />
-  <%="#{address.phone}" %><%= address.alternative_phone unless address.alternative_phone.blank? %><br />
-  <%= address.address1 %><br />
-  <% if address.address2.present? %><%= "#{address.address2}" %><br /><% end %>
-  <%= "#{address.city}, #{address.state_text}, #{address.zipcode}" %><br />
-  <%= "#{address.country.name}" %>
+  <%= address.name %> <%= address.company unless address.company.blank? %><br>
+  <%= address.phone %><%= address.alternative_phone unless address.alternative_phone.blank? %><br>
+  <%= address.address1 %><br>
+  <% if address.address2.present? %><%= address.address2 %><br><% end %>
+  <%= "#{address.city}, #{address.state_text}, #{address.zipcode}" %><br>
+  <%= address.country.name %>
 </div>

data/app/views/spree/admin/shared/_address_form.html.erb

@@ -1,15 +1,22 @@
 <% s_or_b = type.chars.first %>
 
 <div id="<%= type %>" data-hook="address_fields">
-  <div class="field <%= "#{type}-row" %>">
-    <%= f.label :firstname %>
-    <%= f.text_field :firstname, class: 'fullwidth' %>
-  </div>
+  <% if Spree::Config.use_combined_first_and_last_name_in_address %>
+    <div class="field <%= "#{type}-row" %>">
+      <%= f.label :name %>
+      <%= f.text_field :name, class: 'fullwidth' %>
+    </div>
+  <% else %>
+    <div class="field <%= "#{type}-row" %>">
+      <%= f.label :firstname %>
+      <%= f.text_field :firstname, class: 'fullwidth' %>
+    </div>
 
-  <div class="field <%= "#{type}-row" %>">
-    <%= f.label :lastname %>
-    <%= f.text_field :lastname, class: 'fullwidth' %>
-  </div>
+    <div class="field <%= "#{type}-row" %>">
+      <%= f.label :lastname %>
+      <%= f.text_field :lastname, class: 'fullwidth' %>
+    </div>
+  <% end %>
 
   <% if Spree::Config[:company] %>
     <div class="field <%= "#{type}-row" %>">