solidus_backend 2.9.6 → 2.11.0

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_code_batches/new.html.erb

@@ -24,5 +24,5 @@
     <%= f.label :email %>
     <%= f.text_field :email, class: "fullwidth", value: spree_current_user.email %>
   <% end %>
-  <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
+  <%= f.submit t('spree.actions.create'), class: 'btn btn-primary' %>
 <% end %>

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/promotion_codes/new.html.erb

@@ -24,7 +24,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_promotion_promotion_codes_url(@promotion), class: 'button' %>
     </div>
   </fieldset>

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

@@ -7,7 +7,8 @@
       <% if can?(:update, @promotion) %>
         <div class="field">
           <%= label_tag :action_type, t('spree.adjustment_type')%>
-          <%= select_tag 'action_type', options, include_blank: t(:choose_promotion_action, scope: 'spree'), class: 'custom-select fullwidth' %>
+          <%= 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', 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>
@@ -78,7 +85,7 @@
         <tr id="<%= spree_dom_id promotion %>">
           <td><%= promotion.name %></td>
           <td>
-            <%= (promotion.codes.size == 1) ? promotion.codes.take.try!(:value) : t('spree.number_of_codes', count: promotion.codes.size) %>
+            <%= (promotion.codes.size == 1) ? promotion.codes.pluck(:value).first : t('spree.number_of_codes', count: promotion.codes.size) %>
           </td>
           <td>
             <span class="pill pill-<%= promotion.active? ? 'active' : 'inactive' %>">

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/return_authorizations/new.html.erb

@@ -13,7 +13,7 @@
     <%= render partial: 'form', locals: { f: f } %>
 
     <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_return_authorizations_url(@order), class: 'btn btn-primary' %>
     </div>
   </fieldset>

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" %>">

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

@@ -4,6 +4,11 @@
   <div id="preference-settings">
     <div class="field">
       <%= f.label(:calculator_type, Spree::Calculator.model_name.human) %>
+
+      <% if local_assigns.has_key? :hint %>
+        <%= admin_hint t("spree.#{hint}"), t(hint, scope: [:spree, :hints, "spree/calculator"]) %>
+      <% end %>
+
       <%= f.select(:calculator_type, @calculators.map { |c| [c.description, c.name] }, {}, {class: 'custom-select fullwidth js-calculator-type'}) %>
     </div>
 

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

@@ -3,6 +3,9 @@
   <div class="admin-nav-sticky">
     <%= render partial: 'spree/admin/shared/menu' %>
     <div class="admin-nav-footer">
+      <%= button_tag class: 'btn fa fa-chevron-circle-left', id: 'admin-nav-toggle', type: :button do %>
+        <span class="text"><%= t('spree.minimize_menu') %></span>
+      <% end %>
       <%= render partial: 'spree/admin/shared/locale_selection' %>
       <%= render partial: 'spree/admin/shared/navigation_footer' %>
     </div>

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

@@ -1,4 +1,4 @@
 <div class="form-buttons filter-actions actions" data-hook="buttons">
-  <%= button_tag t('spree.actions.create'), class: 'btn btn-primary' %>
+  <%= submit_tag t('spree.actions.create'), class: 'btn btn-primary' %>
   <%= link_to t('spree.actions.cancel'), collection_url, class: 'button' %>
 </div>

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

@@ -20,13 +20,13 @@
       <%= link_to plural_resource_name(Spree::Shipment), spree.edit_admin_order_url(@order) %>
     </li>
 
-    <% if can? :display, Spree::Adjustment %>
+    <% if can? :show, Spree::Adjustment %>
       <li class="<%= "active" if current == "Adjustments" %>" data-hook='admin_order_tabs_adjustments'>
         <%= link_to plural_resource_name(Spree::Adjustment), spree.admin_order_adjustments_url(@order) %>
       </li>
     <% end %>
 
-    <% if can?(:display, Spree::Payment) %>
+    <% if can?(:show, Spree::Payment) %>
       <li class="<%= "active" if current == "Payments" %>" data-hook='admin_order_tabs_payments'>
         <%= link_to plural_resource_name(Spree::Payment), spree.admin_order_payments_url(@order) %>
       </li>
@@ -38,7 +38,7 @@
       </li>
     <% end %>
 
-    <% if can? :display, Spree::ReturnAuthorization %>
+    <% if can? :show, Spree::ReturnAuthorization %>
       <% if @order.completed? %>
         <li class="tab <%= "active" if current == "Return Authorizations" %>" data-hook='admin_order_tabs_return_authorizations'>
           <%= link_to t('spree.admin.tab.rma'), spree.admin_order_return_authorizations_url(@order) %>
@@ -46,7 +46,7 @@
       <% end %>
     <% end %>
 
-    <% if can? :display, Spree::CustomerReturn %>
+    <% if can? :show, Spree::CustomerReturn %>
       <% if @order.completed? %>
         <li class="<%= "active" if current == "Customer Returns" %>" data-hook='admin_order_tabs_customer_returns'>
           <%= link_to plural_resource_name(Spree::CustomerReturn), spree.admin_order_customer_returns_url(@order) %>
@@ -55,9 +55,9 @@
     <% end %>
 
     <% if can?(:manage, Spree::OrderCancellations) && @order.inventory_units.cancelable.present? %>
-      <%= content_tag('li', class: "#{'active' if current == 'Cancel Inventory'}", data: {hook: 'admin_order_tabs_cancel_inventory'}) do %>
+      <li class="<%= "active" if current == "Cancel Inventory" %>" data-hook='admin_order_tabs_cancel_inventory'>
         <%= link_to t('spree.cancel_inventory'), spree.admin_order_cancellations_path(@order) %>
-      <% end %>
+      </li>
     <% end %>
   </ul>
 </nav>

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

@@ -1,7 +1,7 @@
 <% content_for :tabs do %>
   <nav>
     <ul class="tabs" data-hook="admin_settings_payments_tabs">
-      <% if can?(:display, Spree::PaymentMethod) %>
+      <% if can?(:show, Spree::PaymentMethod) %>
         <%= settings_tab_item plural_resource_name(Spree::PaymentMethod), spree.admin_payment_methods_path %>
       <% end %>
     </ul>

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

@@ -1,23 +1,23 @@
 <% content_for :tabs do %>
   <nav>
     <ul class="tabs" data-hook="admin_settings_checkout_tabs">
-      <% if can?(:display, Spree::RefundReason) %>
+      <% if can?(:show, Spree::RefundReason) %>
         <%= settings_tab_item plural_resource_name(Spree::RefundReason), spree.admin_refund_reasons_path %>
       <% end %>
 
-      <% if can?(:display, Spree::ReimbursementType) %>
+      <% if can?(:show, Spree::ReimbursementType) %>
         <%= settings_tab_item plural_resource_name(Spree::ReimbursementType), spree.admin_reimbursement_types_path %>
       <% end %>
 
-      <% if can?(:display, Spree::ReturnReason) %>
+      <% if can?(:show, Spree::ReturnReason) %>
         <%= settings_tab_item plural_resource_name(Spree::ReturnReason), spree.admin_return_reasons_path %>
       <% end %>
 
-      <% if can?(:display, Spree::AdjustmentReason) %>
+      <% if can?(:show, Spree::AdjustmentReason) %>
         <%= settings_tab_item plural_resource_name(Spree::AdjustmentReason), spree.admin_adjustment_reasons_path %>
       <% end %>
 
-      <% if can?(:display, Spree::StoreCreditReason) %>
+      <% if can?(:show, Spree::StoreCreditReason) %>
         <%= settings_tab_item plural_resource_name(Spree::StoreCreditReason), spree.admin_store_credit_reasons_path %>
       <% end %>
     </ul>

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

@@ -3,24 +3,24 @@
     <%= tab :stores, label: :stores, url: spree.admin_stores_path %>
   <% end %>
 
-  <% if can?(:display, Spree::PaymentMethod) %>
+  <% if can?(:show, Spree::PaymentMethod) %>
     <%= tab :payments, url: spree.admin_payment_methods_path %>
   <% end %>
 
-  <% if can?(:display, Spree::TaxCategory) || can?(:display, Spree::TaxRate) %>
+  <% if can?(:show, Spree::TaxCategory) || can?(:show, Spree::TaxRate) %>
     <%= tab :taxes, url: spree.admin_tax_categories_path, match_path: %r(tax_categories|tax_rates) %>
   <% end %>
 
-  <% if can?(:display, Spree::RefundReason) || can?(:display, Spree::ReimbursementType) ||
-    can?(:display, Spree::ReturnReason) || can?(:display, Spree::AdjustmentReason) %>
-    <%= tab :checkout, url: spree.admin_refund_reasons_path, match_path: %r(refund_reasons|reimbursement_types|return_reasons|adjustment_reasons) %>
+  <% if can?(:show, Spree::RefundReason) || can?(:show, Spree::ReimbursementType) ||
+    can?(:show, Spree::ReturnReason) || can?(:show, Spree::AdjustmentReason) %>
+    <%= tab :checkout, url: spree.admin_refund_reasons_path, match_path: %r(refund_reasons|reimbursement_types|return_reasons|adjustment_reasons|store_credit_reasons) %>
   <% end %>
 
-  <% if can?(:display, Spree::ShippingMethod) || can?(:display, Spree::ShippingCategory) || can?(:display, Spree::StockLocation) %>
+  <% if can?(:show, Spree::ShippingMethod) || can?(:show, Spree::ShippingCategory) || can?(:show, Spree::StockLocation) %>
     <%= tab :shipping, url: spree.admin_shipping_methods_path, match_path: %r(shipping_methods|shipping_categories|stock_locations) %>
   <% end %>
 
-  <% if can?(:display, Spree::Zone) %>
+  <% if can?(:show, Spree::Zone) %>
     <%= tab :zones, url: spree.admin_zones_path %>
   <% end %>
 </ul>