solidus_backend 3.1.5 → 3.2.0.alpha

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

@@ -26,15 +26,21 @@
 
           <div class="col-4">
             <div class="field">
-              <%= f.label :with_variant_sku_cont, Spree::Variant.human_attribute_name(:sku) %>
-              <%= f.text_field :with_variant_sku_cont, size: 15 %>
+              <div class="js-kept-variant-sku-input">
+                <%= f.label :with_kept_variant_sku_cont, Spree::Variant.human_attribute_name(:sku) %>
+                <%= f.text_field :with_kept_variant_sku_cont, size: 15 %>
+              </div>
+              <div class="js-all-variant-sku-input">
+                <%= f.label :with_all_variant_sku_cont, Spree::Variant.human_attribute_name(:sku) %>
+                <%= f.text_field :with_all_variant_sku_cont, size: 15 %>
+              </div>
             </div>
           </div>
 
           <div class="col-2">
             <div class="field checkbox">
               <label>
-                <%= f.check_box :with_discarded, { checked: params[:q][:with_discarded] == 'true' }, 'true', 'false' %>
+                <%= f.check_box :with_discarded, { checked: params[:q][:with_discarded] == 'true', class: 'js-with-discarded-input' }, 'true', 'false' %>
                 <%= t('spree.show_deleted') %>
               </label>
             </div>

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

@@ -19,13 +19,15 @@
 
     <%= form_for @promotion, url: object_url, method: :put do |f| %>
       <fieldset class="no-border-top">
-        <div id="promotion-policy-select" class="align-center row">
-          <% Spree::Promotion::MATCH_POLICIES.each do |policy| %>
-            <div class="col-6">
-              <label><%= f.radio_button :match_policy, policy %> <%= t "spree.promotion_form.match_policies.#{policy}" %></label>
-            </div>
-          <% end %>
-        </div>
+        <% if Spree::Config.allow_promotions_any_match_policy %>
+          <div id="promotion-policy-select" class="align-center row">
+            <% Spree::Promotion::MATCH_POLICIES.each do |policy| %>
+              <div class="col-6">
+                <label><%= f.radio_button :match_policy, policy %> <%= t "spree.promotion_form.match_policies.#{policy}" %></label>
+              </div>
+            <% end %>
+          </div>
+        <% end %>
 
         <div id="rules" class="filter_list">
           <% if @promotion.rules.any? %>

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

@@ -99,10 +99,10 @@
             <%= promotion.usage_count %>
           </td>
           <td>
-            <%= promotion.starts_at.to_s(:long) if promotion.starts_at %>
+            <%= Spree::RailsCompatibility.to_fs(promotion.starts_at, :long) if promotion.starts_at %>
           </td>
           <td>
-            <%= promotion.expires_at.to_s(:long) if promotion.expires_at %>
+            <%= Spree::RailsCompatibility.to_fs(promotion.expires_at, :long) if promotion.expires_at %>
           </td>
           <td class="actions">
             <% if can?(:edit, promotion) %>

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

@@ -10,7 +10,7 @@
       <div class="col-3">
         <div class="field">
           <%= f.label :amount %><br/>
-          <%= @refund.amount %>
+          <%= @refund.display_amount %>
         </div>
       </div>
       <div class="col-3">

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

@@ -10,14 +10,14 @@
     <div data-hook="admin_refund_form_fields" class="row">
       <div class="col-3">
         <div class="field">
-          <%= t('spree.payment_amount') %><br/>
-          <%= @refund.payment.amount %>
+          <label><%= t('spree.payment_amount') %></label><br>
+          <%= Spree::Money.new(@refund.payment.amount) %>
         </div>
       </div>
       <div class="col-3">
         <div class="field">
-          <%= t('spree.credit_allowed') %><br/>
-          <%= @refund.payment.credit_allowed %>
+          <label><%= t('spree.credit_allowed') %></label><br/>
+          <%= Spree::Money.new(@refund.payment.credit_allowed) %>
         </div>
       </div>
       <div class="col-3">
@@ -29,13 +29,13 @@
       <div class="col-3">
         <div class="field">
           <%= f.label :refund_reason_id %><br/>
-          <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {include_blank: true}, {class: 'custom-select fullwidth'}) %>
+          <%= f.collection_select(:refund_reason_id, refund_reasons, :id, :name, {prompt: t("spree.choose_reason")}, {class: 'custom-select fullwidth'}) %>
         </div>
       </div>
     </div>
 
     <div class="form-buttons filter-actions actions" data-hook="buttons">
-      <%= f.submit Spree::Refund.model_name.human, class: 'btn btn-primary' %>
+      <%= f.submit t('spree.actions.refund'), class: 'btn btn-primary' %>
       <%= link_to t('spree.actions.cancel'), admin_order_payments_url(@refund.payment.order), class: 'btn btn-primary' %>
     </div>
   </fieldset>

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

@@ -41,7 +41,7 @@
 <%= render "spree/admin/shared/js_locale_data" %>
 
 <%= javascript_tag do -%>
-  Spree.api_key = "<%= try_spree_current_user.try(:spree_api_key) %>";
+  Spree.api_key = "<%= spree_current_user.try(:spree_api_key) %>";
   Spree.env = "<%= Rails.env %>";
 <% end %>
 

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

@@ -7,7 +7,11 @@
         <span class="text"><%= t('spree.minimize_menu') %></span>
       <% end %>
       <%= render partial: 'spree/admin/shared/locale_selection' %>
-      <%= render partial: 'spree/admin/shared/navigation_footer' %>
+      <% if lookup_context.exists?('spree/admin/shared/_navigation_footer') %>
+        <%= render partial: 'spree/admin/shared/navigation_footer' %>
+      <% else %>
+        <%= render partial: 'spree/admin/shared/navigation_footer_fallback' %>
+      <% end %>
     </div>
   </div>
 </div>

data/app/views/spree/admin/shared/{_navigation_footer.html.erb → _navigation_footer_fallback.html.erb}

@@ -3,18 +3,18 @@
      any typical `rails generate spree:custom_user` auth, if you need something
      else you can override it like solidus_auth_devise does.
 -->
-<% if try_spree_current_user %>
+<% if spree_current_user %>
   <ul id="login-nav" class="admin-login-nav">
     <li data-hook="user-account-link">
-      <% if can?(:admin, try_spree_current_user) %>
-        <%= link_to spree.edit_admin_user_path(try_spree_current_user) do %>
+      <% if can?(:admin, spree_current_user) %>
+        <%= link_to spree.edit_admin_user_path(spree_current_user) do %>
           <i class='fa fa-user'></i>
-          <%= try_spree_current_user.email %>
+          <%= spree_current_user.email %>
         <% end %>
       <% else %>
         <a>
           <i class='fa fa-user'></i>
-          <%= try_spree_current_user.email %>
+          <%= spree_current_user.email %>
         </a>
       <% end %>
     </li>

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) %>" data-variant-sku="<%= variant.sku %>">
+                <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?(:edit, Spree::StockItem) %>" data-variant-sku="<%= variant.sku %>">
                   <%# This is rendered in JS %>
                 </tr>
               <% end %>

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

@@ -6,9 +6,11 @@
 
 <% content_for :page_actions do %>
   <ul class='actions inline-menu'>
-    <li>
-      <%= link_to t('spree.new_store_credit_reason'), new_object_url, id: 'admin_new_named_type', class: 'btn btn-primary' %>
-    </li>
+    <% if can?(:create, Spree::StoreCreditReason) %>
+      <li>
+        <%= link_to t('spree.new_store_credit_reason'), new_object_url, id: 'admin_new_named_type', class: 'btn btn-primary' %>
+      </li>
+    <% end %>
   </ul>
 <% end %>
 

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

@@ -70,6 +70,6 @@
   <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',
                  resource: Spree::StoreCredit,
-                 new_resource_url: new_object_url %>
+                 new_resource_url: spree.new_admin_user_store_credit_url %>
   </div>
 <% end %>

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

@@ -72,9 +72,10 @@
       <col style="width: 20%;" />
       <col style="width: 10%;" />
       <col style="width: 10%;" />
-      <col style="width: 25%;" />
+      <col style="width: 20%;" />
+      <col style="width: 10%;" />
       <col style="width: 10%;" />
-      <col style="width: 25%;" />
+      <col style="width: 20%;" />
     </colgroup>
     <thead>
       <tr>
@@ -84,7 +85,7 @@
         <th><%= t('spree.admin.store_credits.created_by') %></th>
         <th><%= Spree::StoreCreditEvent.human_attribute_name(:user_total_amount) %></th>
         <th><%= Spree::StoreCreditEvent.human_attribute_name(:amount_remaining) %></th>
-        <th><%= Spree::StoreCreditReason.human_attribute_name(:name) %></th>
+        <th><%= t('spree.admin.store_credits.reason_for_updating') %></th>
       </tr>
     </thead>
     <tbody>

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

@@ -13,7 +13,35 @@
   <% end %>
 <% end %>
 
+<% content_for :table_filter_title do %>
+  <%= t("spree.filter") %>
+<% end %>
+
+<% content_for :table_filter do %>
+  <%= search_form_for [:admin, @search], url: spree.admin_tax_rates_path do |f| %>
+    <div class= "row">
+      <div class="col-md-6">
+        <div class="field">
+          <%= f.label :zone_id_eq, Spree::Zone.model_name.human %>
+          <%= f.collection_select :zone_id_eq, @available_zones, :id, :name, { include_blank: t("spree.all") }, class: 'select2 fullwidth' %>
+        </div>
+      </div>
+      <div class="col-md-6">
+        <div class="field">
+          <%= f.label :tax_categories_id_eq, Spree::TaxCategory.model_name.human %>
+          <%= f.collection_select :tax_categories_id_eq, @available_categories, :id, :name, { include_blank: t("spree.all") }, class: 'select2 fullwidth' %>
+        </div>
+      </div>
+    </div>
+    <div class="filter-actions">
+      <%= button_tag t("spree.filter_results"), class: "btn btn-primary" %>
+    </div>
+  <% end %>
+<% end %>
+
 <% if @tax_rates.any? %>
+  <%= paginate @tax_rates, scope: spree, theme: "solidus_admin" %>
+
   <table class="index">
     <colgroup>
       <col style="width: 15%">
@@ -55,7 +83,7 @@
         <td><%=tax_rate.included_in_price? ? t('spree.say_yes') : t('spree.say_no') %></td>
         <td><%=tax_rate.show_rate_in_label? ? t('spree.say_yes') : t('spree.say_no') %></td>
         <td><%=tax_rate.expires_at.to_date.to_s(:short_date) if tax_rate.expires_at %></td>
-        <td><%=tax_rate.calculator.to_s %></td>
+        <td><%=tax_rate.calculator && tax_rate.calculator.class.model_name.human %></td>
         <td class="actions">
           <% if can?(:update, tax_rate) %>
             <%= link_to_edit tax_rate, no_text: true %>
@@ -68,6 +96,8 @@
       <% end %>
     </tbody>
   </table>
+
+  <%= paginate @tax_rates, scope: spree, theme: "solidus_admin" %>
 <% else %>
   <div class="no-objects-found">
     <%= render 'spree/admin/shared/no_objects_found',

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

@@ -40,6 +40,7 @@
         <%= label_tag nil, plural_resource_name(Spree::StockLocation) %>
         <ul>
           <% if can?(:manage, Spree::UserStockLocation) %>
+            <%= hidden_field_tag('user[stock_location_ids][]', nil) %>
             <% @stock_locations.each do |stock_location| %>
               <li>
                 <label>

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

@@ -32,7 +32,7 @@
     <% if @user.spree_api_key.present? %>
       <div id="current-api-key">
         <strong><%= t('.key') %>: </strong>
-        <% if @user == try_spree_current_user %>
+        <% if @user == spree_current_user %>
           <%= @user.spree_api_key %>
         <% else %>
           <i>(<%= t('spree.hidden') %>)</i>

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

@@ -87,10 +87,10 @@
         <td class="align-center"><%= l user.created_at.to_date %></td>
         <td data-hook="admin_users_index_row_actions" class="actions">
           <% if can?(:edit, user) %>
-            <%= link_to_edit user, no_text: true %>
+            <%= link_to_edit user, no_text: true, url: spree.admin_user_path(user) %>
           <% end %>
-          <% if can?(:destroy, user) && user.orders.count.zero? %>
-            <%= link_to_delete user, no_text: true %>
+          <% if can?(:destroy, user) && user.can_be_deleted? %>
+            <%= link_to_delete user, no_text: true, url: spree.admin_user_path(user) %>
           <% end %>
         </td>
       </tr>

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

@@ -17,7 +17,8 @@
       </div>
     </div>
   </fieldset>
-  <fieldset class="no-border-top no-border-bottom">
+  <fieldset class="no-border-bottom">
+    <legend><%= t(".options") %></legend>
     <div class="row">
       <% @product.option_types.each_with_index do |option_type, index| %>
           <div class="col-3">
@@ -41,7 +42,8 @@
 </div>
 
 <div data-hook="admin_variant_form_additional_fields">
-  <fieldset class="no-border-top no-border-bottom">
+  <fieldset class="no-border-bottom">
+    <legend><%= t(".properties") %></legend>
     <div class="row">
       <% [:weight, :height, :width, :depth].each_with_index do |field, index| %>
         <div class="col-3">
@@ -58,8 +60,9 @@
 </div>
 
 <div data-hook="admin_variant_form_fields">
-  <fieldset class="no-border-top no-border-bottom">
-    <p> <%== t('.pricing_hint') %> </p>
+  <fieldset class="no-border-bottom">
+    <legend><%= t(".pricing") %></legend>
+    <div class="alert alert-info"><%= t('.pricing_hint') %></div>
 
     <div class="row">
       <div class="col-3">

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

@@ -3,10 +3,9 @@
 <table class="index sortable" data-sortable-link="<%= update_positions_admin_product_variants_path(@product) %>">
   <colgroup>
     <col style="width: 5%" />
-    <col style="width: 25%" />
-    <col style="width: 20%" />
+    <col style="width: 35%" />
     <col style="width: 20%" />
-    <col style="width: 15%" />
+    <col style="width: 25%" />
     <col style="width: 15%" />
   </colgroup>
   <thead data-hook="variants_header">
@@ -27,7 +26,7 @@
         <% end %>
       </td>
       <td><%= variant.options_text %></td>
-      <td><%= variant.display_price.to_html %></td>
+      <td><%= variant.display_price&.to_html %></td>
       <td><%= variant.sku %></td>
       <td class="actions">
         <% if can?(:update, variant) %>
@@ -40,9 +39,11 @@
       </td>
     </tr>
     <% end %>
-    <% if variants.empty? %>
-      <tr><td colspan="4"><%= t('spree.none') %></td></tr>
-    <% end %>
   </tbody>
 </table>
+<% if variants.empty? %>
+  <div class="alert alert-warning">
+    <%= t('.no_variants_found', term: params[:variant_search_term]) %>
+  </div>
+<% end %>
 <%= paginate variants, theme: "solidus_admin" %>

data/app/views/spree/admin/variants/_table_filter.html.erb

@@ -4,14 +4,13 @@
 
 <% content_for :table_filter do %>
   <%= form_for :variant_search, url: spree.admin_product_variants_path(product), method: :get do |f| %>
-    <div class="col-10">
-      <div data-hook="admin_variants_index_search" class="field">
-        <%= f.label :variant_search_term, t('spree.variant_search_placeholder') %>
-        <%= text_field_tag :variant_search_term, params[:variant_search_term], class: "fullwidth", placeholder: t('spree.variant_search_placeholder') %>
+    <div class="row">
+      <div class="col-10">
+        <div data-hook="admin_variants_index_search" class="field">
+          <%= f.label :variant_search_term, t('spree.variant_search_placeholder') %>
+          <%= text_field_tag :variant_search_term, params[:variant_search_term], class: "fullwidth", placeholder: t('spree.variant_search_placeholder') %>
+        </div>
       </div>
-    </div>
-
-    <% if product.variants.with_discarded.discarded.any? %>
       <div class="col-2">
         <div class="field checkbox">
           <label>
@@ -20,10 +19,10 @@
           </label>
         </div>
       </div>
-    <% end %>
+    </div>
 
     <div class="actions filter-actions">
-      <%= f.button :search %>
+      <%= button_tag t('spree.filter_results'), class: 'btn btn-primary' %>
     </div>
   <% end %>
 <% end %>

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

@@ -14,7 +14,7 @@
   <% end %>
 <% end %>
 
-<% if @product.variants.with_discarded.any? %>
+<% if @product.variants.with_discarded.any? || params[:variant_search_term].present? %>
   <%= render "table_filter", product: @product %>
   <%= render "table", variants: @variants %>
 <% else %>

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

@@ -6,6 +6,7 @@
 
 <%= form_for [:admin, @product, @variant] do |f| %>
   <fieldset class="no-border-top" data-hook="admin_variant_new_form">
+    <legend><%= t('.new_variant') %></legend>
     <%= render partial: 'form', locals: { f: f } %>
     <%= render partial: 'spree/admin/shared/new_resource_links' %>
   </fieldset>

data/config/routes.rb

@@ -77,8 +77,8 @@ Spree::Core::Engine.routes.draw do
         get :confirm
         put :complete
         post :resend
-        get "/adjustments/unfinalize", to: "orders#unfinalize_adjustments"
-        get "/adjustments/finalize", to: "orders#finalize_adjustments"
+        put "/adjustments/unfinalize", to: "orders#unfinalize_adjustments"
+        put "/adjustments/finalize", to: "orders#finalize_adjustments"
         put :approve
         put :cancel
         put :resume
@@ -91,7 +91,7 @@ Spree::Core::Engine.routes.draw do
         end
       end
 
-      resources :adjustments
+      resources :adjustments, except: [:show]
       resources :return_authorizations do
         member do
           put :fire

data/lib/spree/backend.rb

@@ -4,7 +4,6 @@ require 'spree_core'
 require 'spree_api'
 
 require 'jquery-rails'
-require 'coffee-rails'
 require 'sassc-rails'
 require 'handlebars_assets'
 require 'font-awesome-rails'

data/lib/spree/backend_configuration.rb

@@ -6,6 +6,16 @@ module Spree
   class BackendConfiguration < Preferences::Configuration
     preference :locale, :string, default: I18n.default_locale
 
+    preference :frontend_product_path,
+      :proc,
+      default: proc {
+        ->(template_context, product) {
+          return unless template_context.spree.respond_to?(:product_path)
+
+          template_context.spree.product_path(product)
+        }
+      }
+
     ORDER_TABS         ||= [:orders, :payments, :creditcard_payments,
                             :shipments, :credit_cards, :return_authorizations,
                             :customer_returns, :adjustments, :customer_details]

data/solidus_backend.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://solidus.io'
   s.license     = 'BSD-3-Clause'
 
+  s.metadata['rubygems_mfa_required'] = 'true'
+
   s.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(spec|script)/})
   end
@@ -24,7 +26,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'solidus_api', s.version
   s.add_dependency 'solidus_core', s.version
 
-  s.add_dependency 'coffee-rails'
   s.add_dependency 'font-awesome-rails', '~> 4.0'
   s.add_dependency 'jbuilder', '~> 2.8'
   s.add_dependency 'jquery-rails'

data/vendor/assets/javascripts/solidus_admin/select2_locales/select2_locale_en-CA.js

@@ -0,0 +1,10 @@
+/**
+ * Select2 English Canada translations
+ */
+(function ($) {
+    "use strict";
+
+    $.fn.select2.locales['en-CA'] = {};
+
+    $.extend($.fn.select2.defaults, $.fn.select2.locales['en-CA']);
+})(jQuery);

data/vendor/assets/stylesheets/solidus_admin/bootstrap/mixins/_lists.scss

@@ -5,3 +5,38 @@
   padding-left: 0;
   list-style: none;
 }
+
+dl {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+  width: 100%;
+  overflow: hidden;
+  margin: 5px 0;
+  color: lighten($body-color, 15);
+
+  dt,
+  dd {
+    min-width: 40%;
+    line-height: 16px;
+    padding: 5px;
+  }
+
+  dt {
+    font-weight: $font-weight-bold;
+    padding-left: 0;
+  }
+
+  dd {
+    text-align: right;
+    padding-right: 0;
+    margin-left: 0;
+  }
+}
+
+.dl-collapse {
+  dt,
+  dd {
+    width: auto;
+  }
+}