solidus_backend 3.2.4 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b86594eac44c015e9c7d6c206ce3c15086baa96db0338ccb845e026b9d61c0d
-  data.tar.gz: 388007e9b8b1dc8fe7ac3c04af96d60bb06d44fbddc0cd84919aaae65a7b5497
+  metadata.gz: 167281f642dc52cabba45304f1ec89744ea6583885fc53783303a88d949d83e6
+  data.tar.gz: 1a49a77a9e9c3dedbe2fedbfb5877a61c5fade7e435df5a28b88755bcf8cb6ed
 SHA512:
-  metadata.gz: a1005b2bed74bc5c3fe9c20bf964aa5c73a96fe45f751752751a1f17f8f18fef03c695cc911d4e6e72f7381aad45399f5a63f188316931bea22bd8db3079e3bf
-  data.tar.gz: 5c98470d7f898b841413275bb8296f4c4ed50263c995696b3baf5b8be0ac98e4dbaeb82022b18833facfffd082d5c002fd86bf7c12d81e925c41dbd3d9b01677
+  metadata.gz: 4715eaba5c97daa199678e78498cb606bf1ce3cfaffe9b209c0dd388175454d91f9c46666c5143dff8244342fc1aa1061dbe18b202482c1e1a8e9531263fbb21
+  data.tar.gz: 5f9bd79cd6ce2c349bbe553889d00ba0fdf0dc3fd06961e8f72cc9ff208db8a427eaac33d038b774d840d074cd34300faef41f46558f101b7179fd354014a0df

data/app/assets/javascripts/spree/backend/orders/edit.js

@@ -1,6 +1,8 @@
 Spree.ready(function () {
   'use strict';
 
-  $('[data-hook="add_product_name"]').find('.variant_autocomplete').variantAutocomplete({ suppliable_only: true });
+  $('[data-hook="add_product_name"]').find('.variant_autocomplete').variantAutocomplete({
+    searchParameters: function (_term) { return { suppliable_only: true } }
+  });
   $("[data-hook='admin_orders_index_search']").find(".variant_autocomplete").variantAutocomplete();
 });

data/app/assets/javascripts/spree/backend/product_picker.js

@@ -1,9 +1,32 @@
+/**
+  * Make the element a select2 dropdown used for finding Products. By default,
+  * it allows the Products to be found by its name and its Variants' SKUs.
+  * @param  {Object} options Options
+  * @param  {Boolean} [options.multiple=true] Allow multiple products to be selectable
+  * @param  {Function|undefined} options.searchParameters Returns a hash object for params to merge on the select2 ajax request
+  *                                                       Accepts an argument of the select2 search term. To use custom Ransack
+  *                                                       define q on the hash and add your custom terms. Note, you need to
+  *                                                       ensure that the attributes are allowed to be Ransacked.
+  */
 $.fn.productAutocomplete = function (options) {
   'use strict';
 
   // Default options
   options = options || {}
   var multiple = typeof(options['multiple']) !== 'undefined' ? options['multiple'] : true
+  function extraParameters(term) {
+    if (typeof(options['searchParameters']) === 'function') {
+      return options['searchParameters'](term)
+    }
+
+    return {
+      q: {
+        name_cont: term,
+        variants_including_master_sku_start: term,
+        m: 'or'
+      }
+    }
+  }
 
   function formatProduct(product) {
     return Select2.util.escapeMarkup(product.name);
@@ -26,15 +49,11 @@ $.fn.productAutocomplete = function (options) {
       datatype: 'json',
       params: { "headers": {  'Authorization': 'Bearer ' + Spree.api_key } },
       data: function (term, page) {
-        return {
-          q: {
-            name_cont: term,
-            variants_including_master_sku_start: term,
-            m: 'or'
-          },
+        const params = {
           token: Spree.api_key,
           page: page
         };
+        return _.extend(params, extraParameters(term));
       },
       results: function (data, page) {
         var products = data.products ? data.products : [];

data/app/assets/javascripts/spree/backend/variant_autocomplete.js

@@ -7,10 +7,38 @@
     });
   };
 
-  $.fn.variantAutocomplete = function(searchOptions) {
-    if (searchOptions == null) {
-      searchOptions = {};
+  /**
+    * Make the element a select2 dropdown used for finding Variants. By default, the search term will be
+    * passed to the defined Spree::Config.variant_search_class by the controller with its defined scope.
+    * @param  {Object|undefined|null} options Options
+    * @param  {Function|undefined} options.searchParameters Returns a hash object for params to merge on the select2 ajax request
+    *                                                       Accepts an argument of the select2 search term. To use Ransack, define
+    *                                                       variant_search_term as a falsy value, and q as the Ransack query. Note,
+    *                                                       you need to ensure that the attributes are allowed to be Ransacked.
+    */
+  $.fn.variantAutocomplete = function(options) {
+    function extraParameters(term) {
+      if (typeof(options) === 'object') {
+        if (typeof(options['searchParameters']) === 'function') {
+          return options['searchParameters'](term)
+        } else {
+          console.warn(
+            "Solidus deprecation: Passing an object of parameters to variantAutocomplete is deprecated. Instead, on the options object, please declare `searchParameters` as a function returning the parameters.\n\n",
+            "Deprecated usage:\n",
+            "$('#id').variantAutocomplete({\n",
+            "  suppliable_only: true\n",
+            "})",
+            "\n\nNew usage:\n",
+            "$('#id').variantAutocomplete({\n",
+            "  searchParameters: function (_selectSearchTerm) { return { suppliable_only: true  } }\n",
+            "})"
+          )
+        }
+      }
+
+      return {}
     }
+
     this.select2({
       placeholder: Spree.translations.variant_placeholder,
       minimumInputLength: 3,
@@ -35,7 +63,7 @@
             token: Spree.api_key,
             page: page
           };
-          return _.extend(searchData, searchOptions);
+          return _.extend(searchData, extraParameters(term));
         },
 
         results: function(data, page) {

data/app/assets/javascripts/spree/backend/views/cart/line_item_row.js

@@ -84,6 +84,8 @@ Spree.Views.Cart.LineItemRow = Backbone.View.extend({
       noCancel: this.model.isNew() && this.model.collection.length == 1
     });
     this.$el.html(html);
-    this.$("[name=variant_id]").variantAutocomplete({ suppliable_only: true });
+    this.$("[name=variant_id]").variantAutocomplete({
+      searchParameters: function (_term) { return { suppliable_only: true  } }
+    });
   }
 });

data/app/assets/stylesheets/spree/backend/shared/_tables.scss

@@ -1,3 +1,5 @@
+@import "spree/backend/components/actions";
+
 table {
   // Extend all tables with Bootstrap's default table style
   @extend .table;
@@ -114,8 +116,8 @@ table {
   tbody {
     tr {
       &.deleted td {
-        background-color: lighten(theme-color("danger"), 6);
-        border-color: lighten(theme-color("danger"), 15);
+        background-color: $color-action-remove-bg;
+        text-decoration: line-through;
       }
     }
 

data/app/controllers/spree/admin/payment_methods_controller.rb

@@ -69,6 +69,12 @@ module Spree
       def payment_method_params
         params.require(:payment_method).permit!
       end
+
+      def build_resource
+        model_class.new(
+          store_ids: [Spree::Store.default.id].compact
+        )
+      end
     end
   end
 end

data/app/controllers/spree/admin/prices_controller.rb

@@ -8,7 +8,7 @@ module Spree
       def index
         params[:q] ||= {}
 
-        @search = @product.prices.accessible_by(current_ability, :index).ransack(params[:q])
+        @search = @product.prices.kept.accessible_by(current_ability, :index).ransack(params[:q])
         @master_prices = @search.result
           .currently_valid
           .for_master

data/app/controllers/spree/admin/variants_controller.rb

@@ -32,6 +32,7 @@ module Spree
 
       def load_data
         @tax_categories = Spree::TaxCategory.order(:name)
+        @shipping_categories = Spree::ShippingCategory.order(:name)
       end
 
       def variant_includes

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

@@ -36,7 +36,7 @@
       </tbody>
     </table>
 
-    <% if can?([:create, :update], Spree::ProductProperty) %>
+    <% if can?(:create, Spree::ProductProperty) && can?(:update, Spree::ProductProperty) %>
       <%= render 'spree/admin/shared/edit_resource_links' %>
     <% end %>
 
@@ -95,7 +95,7 @@
             <% end %>
           </tbody>
         </table>
-        <% if can?([:create, :update], Spree::VariantPropertyRule) %>
+        <% if can?(:create, Spree::VariantPropertyRule) && can?(:update, Spree::VariantPropertyRule) %>
           <%= render 'spree/admin/shared/edit_resource_links' %>
         <% end %>
       </fieldset>

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

@@ -1,4 +1,4 @@
-<div data-hook="admin_<%= model_name %>_form_generate_vat_prices" class="<%= local_assigns[:wrapper_class] %> checkbox">
+<div data-hook="admin_<%= model_name %>_form_generate_vat_prices" class="checkbox">
   <label>
     <%= form.check_box :rebuild_vat_prices, checked: form.object.prices.size <= 1 %>
     <%= Spree::Variant.human_attribute_name(:rebuild_vat_prices) %>

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

@@ -19,6 +19,20 @@
               <%= t('spree.included_in_price') %>
             </label>
           </div>
+          <div data-hook="level" class="field">
+            <%= f.label :level, t('spree.tax_rate_level') %>
+            <%= admin_hint t('spree.tax_rate_level'), t(:tax_rate_level, scope: [:spree, :hints, "spree/tax_rate"]) %>
+            <ul>
+              <% Spree::TaxRate.levels.keys.each do |level| %>
+                <li>
+                  <label>
+                    <%= f.radio_button :level, level %>
+                    <%= t("spree.#{level}_level") %>
+                  </label>
+                </li>
+              <% end %>
+            </ul>
+          </div>
         </div>
 
         <div class="col-5">

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

@@ -12,7 +12,7 @@
         <% if @taxon.parent %>
           <div class="input-group-prepend">
             <span class="input-group-text">
-              <%= @taxon.permalink.split('/')[0...-1].join('/') + '/' %>
+              <%= @taxon.permalink.split('/')[...-1].join('/') + '/' %>
             </span>
           </div>
         <% end %>

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

@@ -1,5 +1,5 @@
 <% content_for :page_actions do %>
-  <% if can?([:admin, :create], Spree::Order) %>
+  <% if can?(:admin, Spree::Order) && can?(:create, Spree::Order) %>
     <li>
       <%= link_to t(".create_order"), spree.new_admin_order_path(user_id: @user.id), class: 'btn btn-primary' %>
     </li>

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

@@ -60,7 +60,7 @@
                 </span>
               </td>
               <td class="order-number">
-                <% if can?([:admin, :edit], order) %>
+                <% if can?(:admin, order) && can?(:edit, order) %>
                   <%= link_to order.number, edit_admin_order_url(order) %>
                 <% else %>
                   <%= order.number %>

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

@@ -38,7 +38,7 @@
         <tr data-hook="admin_orders_index_rows">
           <td class="order-completed-at"><%= l(order.completed_at.to_date) if order.completed_at %></td>
           <td class="order-number">
-            <% if can?([:admin, :edit], order) %>
+            <% if can?(:admin, order) && can?(:edit, order) %>
               <%= link_to order.number, edit_admin_order_path(order) %>
             <% else %>
               <%= order.number %>

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

@@ -70,14 +70,11 @@
           <%= f.label :price %>
           <%= render "spree/admin/shared/number_with_currency", f: f, amount_attr: :price, currency: @variant.default_price_or_build.currency %>
         </div>
+        <% if show_rebuild_vat_checkbox? %>
+          <%= render "spree/admin/shared/rebuild_vat_prices_checkbox", form: f, model_name: "variant" %>
+        <% end %>
       </div>
 
-      <% if show_rebuild_vat_checkbox? %>
-        <div class="col-3">
-          <%= render "spree/admin/shared/rebuild_vat_prices_checkbox", form: f, model_name: "variant", wrapper_class: "field" %>
-        </div>
-      <% end %>
-
       <div class="col-3">
         <div class="field" data-hook="cost_price">
           <%= f.label :cost_price %>
@@ -97,6 +94,19 @@
                                   { class: 'custom-select fullwidth' } %>
         </div>
       </div>
+
+      <div class="col-3">
+        <div class="field" data-hook="shipping_category">
+          <%= f.label :shipping_category %>
+          <%= f.field_hint :shipping_category %>
+          <%= f.collection_select :shipping_category_id,
+                                  @shipping_categories,
+                                  :id,
+                                  :name,
+                                  { include_blank: t('.use_product_shipping_category') },
+                                  { class: 'custom-select fullwidth' } %>
+        </div>
+      </div>
     </div>
   </fieldset>
 </div>

data/solidus_backend.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
     f.match(%r{^(spec|script)/})
   end
 
-  s.required_ruby_version = '>= 2.5.0'
+  s.required_ruby_version = '>= 2.7.0'
   s.required_rubygems_version = '>= 1.8.23'
 
   s.add_dependency 'solidus_api', s.version