solidus_backend 2.10.3 → 2.11.4

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

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

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?(:admin, Spree::PaymentMethod) %>
     <%= tab :payments, url: spree.admin_payment_methods_path %>
   <% end %>
 
-  <% if can?(:display, Spree::TaxCategory) || can?(:display, Spree::TaxRate) %>
+  <% if can?(:admin, Spree::TaxCategory) || can?(:admin, 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) %>
+  <% if can?(:admin, Spree::RefundReason) || can?(:admin, 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?(:admin, Spree::ShippingMethod) || can?(:admin, Spree::ShippingCategory) || can?(:admin, 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?(:admin, Spree::Zone) %>
     <%= tab :zones, url: spree.admin_zones_path %>
   <% end %>
 </ul>

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

@@ -1,16 +1,16 @@
 <% content_for :tabs do %>
   <nav>
     <ul class="tabs" data-hook="admin_settings_shipping_tabs">
-      <% if can?(:display, Spree::ShippingMethod) %>
+      <% if can?(:show, Spree::ShippingMethod) %>
         <%= settings_tab_item plural_resource_name(Spree::ShippingMethod), spree.admin_shipping_methods_path %>
       <% end %>
 
-      <% if can?(:display, Spree::ShippingCategory) %>
+      <% if can?(:show, Spree::ShippingCategory) %>
         <%= settings_tab_item plural_resource_name(Spree::ShippingCategory), spree.admin_shipping_categories_path %>
 
       <% end %>
 
-      <% if can?(:display, Spree::StockLocation) %>
+      <% if can?(:show, Spree::StockLocation) %>
         <%= settings_tab_item plural_resource_name(Spree::StockLocation), spree.admin_stock_locations_path %>
       <% end %>
     </ul>

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

@@ -1,11 +1,11 @@
 <% content_for :tabs do %>
   <nav>
     <ul class="tabs" data-hook="admin_settings_taxes_tabs">
-      <% if can? :display, Spree::TaxCategory %>
+      <% if can? :show, Spree::TaxCategory %>
         <%= settings_tab_item plural_resource_name(Spree::TaxCategory), spree.admin_tax_categories_path %>
       <% end %>
 
-      <% if can? :display, Spree::TaxRate %>
+      <% if can? :show, Spree::TaxRate %>
         <%= settings_tab_item plural_resource_name(Spree::TaxRate), spree.admin_tax_rates_path %>
       <% end %>
     </ul>

data/app/views/spree/admin/shared/preference_fields/_encrypted_string.html.erb

@@ -0,0 +1,12 @@
+<% label = local_assigns[:label].presence %>
+<% html_options = {class: 'input_string fullwidth'}.merge(local_assigns[:html_options] || {}) %>
+
+<div class="field">
+  <% if local_assigns[:form] %>
+    <%= form.label attribute, label %>
+    <%= form.text_field attribute, html_options %>
+  <% else %>
+    <%= label_tag name, label %>
+    <%= text_field_tag name, value, html_options %>
+  <% end %>
+</div>

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

@@ -54,6 +54,24 @@
       <%= error_message_on :shipping_method, :tracking_url %>
     <% end %>
   </div>
+
+  <div class="col-5 label-block">
+    <%= f.field_container :stock_locations do %>
+      <label>
+        <%= f.check_box(:available_to_all) %>
+        <%= Spree::ShippingMethod.human_attribute_name :available_to_all %>
+        <%= f.field_hint :available_to_all %>
+        <%= error_message_on :shipping_method, :available_to_all %>
+      </label>
+      <%= f.collection_select :stock_location_ids,
+        Spree::StockLocation.order_default, :id, :name,
+        {},
+        class: 'fullwidth select2',
+        multiple: true,
+        placeholder: t('spree.admin.shipping_methods.form.stock_locations_placeholder') %>
+      <%= error_message_on :shipping_method, :stock_locations %>
+    <% end %>
+  </div>
 </div>
 
 <%= f.field_container :available_to_users, class: %w(checkbox) do %>

data/app/views/spree/admin/stock_items/_stock_management.html.erb

@@ -72,7 +72,7 @@
             </colgroup>
             <% variant.stock_items.each do |item| %>
               <% if @stock_item_stock_locations.include?(item.stock_location) %>
-                <tr class="js-edit-stock-item stock-item-edit-row" data-variant-id="<%= variant.id %>" data-stock-item="<%= item.to_json %>" data-stock-location-name="<%= item.stock_location.name %>" data-track-inventory="<%= variant.should_track_inventory? %>" data-can-edit="<%= can?(:admin, Spree::StockItem) %>">
+                <tr class="js-edit-stock-item stock-item-edit-row" data-variant-id="<%= variant.id %>" data-stock-item="<%= item.to_json %>" data-stock-location-name="<%= item.stock_location.name %>" data-track-inventory="<%= variant.should_track_inventory? %>" data-can-edit="<%= can?(:admin, Spree::StockItem) %>" data-variant-sku="<%= variant.sku %>">
                   <%# This is rendered in JS %>
                 </tr>
               <% end %>

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

@@ -8,7 +8,7 @@
 
 <% content_for :page_actions do %>
   <ul class="actions inline-menu">
-    <% if can?(:display, Spree::StockMovement) %>
+    <% if can?(:show, Spree::StockMovement) %>
       <li>
         <%= link_to plural_resource_name(Spree::StockMovement), admin_stock_location_stock_movements_path(@stock_location.id), class: 'btn btn-primary'  %>
       </li>

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

@@ -16,6 +16,7 @@
 <% end %>
 
 <% if @stock_locations.any? %>
+  <%= paginate @stock_locations, theme: "solidus_admin" %>
   <table class="index sortable" id='listing_stock_locations' data-hook data-sortable-link="<%= update_positions_admin_stock_locations_url %>">
     <colgroup>
       <col style="width: 10%">
@@ -51,7 +52,7 @@
             </span>
           </td>
           <td>
-            <% if can?(:display, Spree::StockMovement) %>
+            <% if can?(:show, Spree::StockMovement) %>
               <%= link_to plural_resource_name(Spree::StockMovement), admin_stock_location_stock_movements_path(stock_location.id) %>
             <% else %>
               Stock Movements
@@ -69,6 +70,7 @@
       <% end %>
     </tbody>
   </table>
+  <%= paginate @stock_locations, theme: "solidus_admin" %>
 <% else %>
   <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',

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

@@ -1,6 +1,6 @@
 <% admin_breadcrumb(t('spree.settings')) %>
 <% admin_breadcrumb(t('spree.admin.tab.shipping')) %>
-<% if can?(:display, Spree::StockLocation) %>
+<% if can?(:show, Spree::StockLocation) %>
   <% admin_breadcrumb(link_to plural_resource_name(Spree::StockLocation), spree.admin_stock_locations_path) %>
 <% else %>
   <% admin_breadcrumb(plural_resource_name(Spree::StockLocation)) %>
@@ -12,6 +12,35 @@
 <% end %>
 <% admin_breadcrumb(plural_resource_name(Spree::StockMovement)) %>
 
+<% content_for :table_filter_title do %>
+  <%= t('spree.filter') %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <%=
+    search_form_for(
+      [:admin, @search],
+      url: admin_stock_location_stock_movements_path(
+        params[:stock_location_id]
+    )) do |f|
+  %>
+    <div class ="row">
+      <div class="field-block col-12 col-md-6 col-lg-4 col-xl-3">
+        <div class="field">
+          <%= label_tag :q_variant_sku_eq, "#{t('spree.variant')} #{t('spree.sku')}" %>
+          <%= f.text_field :variant_sku_eq, value: params[:q][:variant_sku_eq] %>
+        </div>
+      </div>
+    </div>
+
+    <div class="clearfix"></div>
+
+    <div class="actions filter-actions">
+      <%= button_tag t('spree.filter_results'), class: 'btn btn-primary' %>
+    </div>
+  <% end %>
+<% end %>
+
 <% if @stock_movements.any? %>
 <table class="index" id='listing_stock_movements'>
   <colgroup>

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

@@ -56,7 +56,7 @@
                 <span><%= t store_credit.invalidated? ? 'spree.say_yes' : 'spree.say_no' %></span>
               </td>
               <td class="actions" data-hook="admin_store_credits_index_row_actions">
-                <% if can?(:show, store_credit) %>
+                <% if can?(:edit, store_credit) %>
                   <%= link_to_edit_url admin_user_store_credit_path(@user, store_credit), { no_text: true, class: 'edit' } %>
                 <% end %>
               </td>

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

@@ -44,6 +44,12 @@
       <%= f.error_message_on :mail_from_address %>
     <% end %>
 
+    <%= f.field_container :bcc_email do %>
+      <%= f.label :bcc_email %>
+      <%= f.text_field :bcc_email, class: 'fullwidth' %>
+      <%= f.error_message_on :bcc_email %>
+    <% end %>
+
     <%= f.field_container :default_currency do %>
       <%= f.label :default_currency %>
       <%= f.select :default_currency,

data/app/views/spree/admin/style_guide/topics/tables/_building_tables.html.erb

@@ -1,7 +1,8 @@
 <%- snippet = capture do %>
-  <table>
+  <table class='selectable-table'>
     <thead>
       <tr>
+        <th></th>
         <th colspan="2">Item Description</th>
         <th>Long Item Text</th>
         <th>Price</th>
@@ -12,6 +13,7 @@
 
     <tbody>
       <tr>
+        <td><%= check_box_tag 'selected_ids[]', 1, false, class: 'selectable' %></td>
         <td class="item-image">
           <img src="http://placehold.it/50x50">
         </td>
@@ -33,13 +35,35 @@
         <td>$22.99</td>
       </tr>
       <tr>
-        <td colspan="5">UPS Ground (USD)</td>
+        <td><%= check_box_tag 'selected_ids[]', 1, false, class: 'selectable' %></td>
+        <td class="item-image">
+          <img src="http://placehold.it/50x50">
+        </td>
+        <td class="no-wrap">
+          Ruby on Rails Bag<br>
+          SKU: ROR-00012
+        </td>
+        <td>
+          Lorem ipsum dolor sit amet, consectetur adipiscing elit. Nihil illinc huc pervenit.
+          Sed quae tandem ista ratio est? Ergo ita: non posse honeste vivi, nisi honeste vivatur?
+          Scisse enim te quis coarguere possit? Duo Reges: constructio interrete.
+          Sic, et quidem diligentius saepiusque ista loquemur inter nos agemusque communiter.
+          Sed in rebus apertissimis nimium longi sumus.
+          Quod si ita se habeat, non possit beatam praestare vitam sapientia.
+          Etenim nec iustitia nec amicitia esse omnino poterunt, nisi ipsae per se expetuntur.
+        </td>
+        <td>$22.99</td>
+        <td class="no-wrap">1 x on hand</td>
+        <td>$22.99</td>
+      </tr>
+      <tr>
+        <td colspan="6">UPS Ground (USD)</td>
         <td>
           <span>$5.00</span>
         </td>
       </tr>
       <tr>
-        <td colspan="6">No tracking details provided.</td>
+        <td colspan="7">No tracking details provided.</td>
       </tr>
     </tbody>
   </table>

data/app/views/spree/admin/style_guide/topics/typography/_colors.html.erb

@@ -39,17 +39,17 @@ colors = [
     used_for: 'Buttons primary actions, links, active states.'
   },
   {
-    name: '$color-success',
+    name: 'theme-color(success)',
     value: '#52B73B',
     used_for: 'Success actions.'
   },
   {
-    name: '$color-error',
+    name: 'theme-color(danger)',
     value: '#CE452A',
     used_for: 'Errors, destructive action warnings.'
   },
   {
-    name: '$color-notice',
+    name: 'theme-color(warning)',
     value: '#FFDD59',
     used_for: 'Warnings actions.'
   }