solidus_backend 4.3.5 → 4.4.0

data/lib/spree/backend_configuration.rb

@@ -19,6 +19,89 @@ module Spree
       solidus_admin: 'spree/backend/themes/solidus_admin'
     }
 
+    preference :search_fields, :hash, default: {
+      "spree/admin/orders" => [
+        {
+          partial: "spree/admin/shared/search_fields/date_range_picker",
+          locals: {
+            attribute: :created_at,
+            label: -> { I18n.t(:date_range, scope: :spree) }
+          }
+        },
+        {
+          partial: "spree/admin/shared/search_fields/select",
+          locals: {
+            ransack: :state_eq,
+            label: -> { I18n.t(:status, scope: :spree) },
+            options: -> {
+              Spree::Order.state_machines[:state].states.collect { |s| [I18n.t(s.name, scope: 'spree.order_state'), s.value] }
+            }
+          }
+        },
+        {
+          partial: "spree/admin/shared/search_fields/select",
+          locals: {
+            ransack: :shipment_state_eq,
+            label: -> { I18n.t(:shipment_state, scope: :spree) },
+            options: -> {
+              %i[backorder canceled partial pending ready shipped].map { |state| [I18n.t("spree.shipment_states.#{state}"), state] }
+            }
+          }
+        },
+        {
+          partial: "spree/admin/shared/search_fields/variant_autocomplete",
+          locals: {
+            ransack: :line_items_variant_id_in,
+            label: -> { I18n.t(:variant, scope: :spree) }
+          }
+        },
+        {
+          partial: "spree/admin/shared/search_fields/text_field",
+          locals: {
+            ransack: :number_start,
+            label: -> { I18n.t(:order_number, scope: :spree, number: "") }
+          }
+        },
+        {
+          partial: "spree/admin/shared/search_fields/text_field",
+          locals: {
+            ransack: :shipments_number_start,
+            label: -> { I18n.t(:shipment_number, scope: :spree) }
+          }
+        },
+        {
+          partial: "spree/admin/shared/search_fields/text_field",
+          locals: {
+            ransack: :bill_address_name_cont,
+            label: -> { I18n.t(:name_contains, scope: :spree) }
+          }
+        },
+        {
+          partial: "spree/admin/shared/search_fields/text_field",
+          locals: {
+            ransack: :email_start,
+            label: -> { I18n.t(:email, scope: :spree) }
+          }
+        },
+        {
+          partial: "spree/admin/shared/search_fields/select",
+          locals: {
+            ransack: :store_id_eq,
+            label: -> { I18n.t(:store, scope: :spree) },
+            options: -> { Spree::Store.all.map { |store| [store.name, store.id] } },
+          },
+          if: -> { Spree::Store.many? }
+        },
+        {
+          partial: "spree/admin/shared/search_fields/checkbox",
+          locals: {
+            ransack: :completed_at_not_null,
+            label: -> { I18n.t(:show_only_complete_orders, scope: :spree) }
+          }
+        }
+      ]
+    }
+
     # @!attribute [rw] theme
     #   @return [String] Default admin theme name
     versioned_preference :theme, :string, initial_value: 'classic', boundaries: { "4.2.0" => "solidus_admin", "4.4.0" => "solidus" }
@@ -129,24 +212,6 @@ module Spree
             ),
           ],
         ),
-        MenuItem.new(
-          label: :promotions,
-          icon: admin_updated_navbar ? 'ri-megaphone-line' : 'bullhorn',
-          partial: 'spree/admin/shared/promotion_sub_menu',
-          condition: -> { can?(:admin, Spree::Promotion) },
-          url: :admin_promotions_path,
-          data_hook: :admin_promotion_sub_tabs,
-          children: [
-            MenuItem.new(
-              label: :promotions,
-              condition: -> { can?(:admin, Spree::Promotion) },
-            ),
-            MenuItem.new(
-              label: :promotion_categories,
-              condition: -> { can?(:admin, Spree::PromotionCategory) },
-            ),
-          ],
-        ),
         MenuItem.new(
           label: :stock,
           icon: admin_updated_navbar ? 'ri-stack-line' : 'cubes',

data/solidus_backend.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_backend
 version: !ruby/object:Gem::Version
-  version: 4.3.5
+  version: 4.4.0
 platform: ruby
 authors:
 - Solidus Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-05-24 00:00:00.000000000 Z
+date: 2024-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_api
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.5
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.5
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: solidus_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.5
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.3.5
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: font-awesome-rails
   requirement: !ruby/object:Gem::Requirement
@@ -198,8 +198,6 @@ files:
 - app/assets/javascripts/spree/backend/product_picker.js
 - app/assets/javascripts/spree/backend/products/index.js
 - app/assets/javascripts/spree/backend/progress.js
-- app/assets/javascripts/spree/backend/promotions.js
-- app/assets/javascripts/spree/backend/promotions/activation.js
 - app/assets/javascripts/spree/backend/shipments.js
 - app/assets/javascripts/spree/backend/shipping_methods/stock_locations_picker.js
 - app/assets/javascripts/spree/backend/spree-select2.js
@@ -218,9 +216,6 @@ files:
 - app/assets/javascripts/spree/backend/templates/orders/shipping_method.hbs
 - app/assets/javascripts/spree/backend/templates/products/sortable.hbs
 - app/assets/javascripts/spree/backend/templates/products/upload_progress.hbs
-- app/assets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_flat_rate.hbs
-- app/assets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_percent.hbs
-- app/assets/javascripts/spree/backend/templates/promotions/rules/option_values.hbs
 - app/assets/javascripts/spree/backend/templates/stock_items/stock_location_stock_item.hbs
 - app/assets/javascripts/spree/backend/templates/tables/return_item_sum_amount.hbs
 - app/assets/javascripts/spree/backend/templates/tables/selectable_label.hbs
@@ -233,7 +228,6 @@ files:
 - app/assets/javascripts/spree/backend/turbolinks-integration.js
 - app/assets/javascripts/spree/backend/user_picker.js
 - app/assets/javascripts/spree/backend/variant_autocomplete.js
-- app/assets/javascripts/spree/backend/views/calculators/tiered.js
 - app/assets/javascripts/spree/backend/views/cart/add_line_item_button.js
 - app/assets/javascripts/spree/backend/views/cart/empty_cart_button.js
 - app/assets/javascripts/spree/backend/views/cart/line_item_row.js
@@ -254,7 +248,6 @@ files:
 - app/assets/javascripts/spree/backend/views/payment/new.js
 - app/assets/javascripts/spree/backend/views/payment/payment_row.js
 - app/assets/javascripts/spree/backend/views/product/search.js
-- app/assets/javascripts/spree/backend/views/promotions/option_values_rule.js
 - app/assets/javascripts/spree/backend/views/state_select.js
 - app/assets/javascripts/spree/backend/views/stock/add_stock_item.js
 - app/assets/javascripts/spree/backend/views/stock/edit_stock_item_row.js
@@ -306,7 +299,6 @@ files:
 - app/assets/stylesheets/spree/backend/sections/_log_entries.scss
 - app/assets/stylesheets/spree/backend/sections/_orders.scss
 - app/assets/stylesheets/spree/backend/sections/_products.scss
-- app/assets/stylesheets/spree/backend/sections/_promotions.scss
 - app/assets/stylesheets/spree/backend/sections/_return_authorizations.scss
 - app/assets/stylesheets/spree/backend/sections/_stock_management.scss
 - app/assets/stylesheets/spree/backend/sections/_store_credits.scss
@@ -356,12 +348,6 @@ files:
 - app/controllers/spree/admin/prices_controller.rb
 - app/controllers/spree/admin/product_properties_controller.rb
 - app/controllers/spree/admin/products_controller.rb
-- app/controllers/spree/admin/promotion_actions_controller.rb
-- app/controllers/spree/admin/promotion_categories_controller.rb
-- app/controllers/spree/admin/promotion_code_batches_controller.rb
-- app/controllers/spree/admin/promotion_codes_controller.rb
-- app/controllers/spree/admin/promotion_rules_controller.rb
-- app/controllers/spree/admin/promotions_controller.rb
 - app/controllers/spree/admin/properties_controller.rb
 - app/controllers/spree/admin/refund_reasons_controller.rb
 - app/controllers/spree/admin/refunds_controller.rb
@@ -400,12 +386,10 @@ files:
 - app/helpers/spree/admin/navigation_helper.rb
 - app/helpers/spree/admin/orders_helper.rb
 - app/helpers/spree/admin/products_helper.rb
-- app/helpers/spree/admin/promotions_helper.rb
 - app/helpers/spree/admin/reimbursement_type_helper.rb
 - app/helpers/spree/admin/stock_locations_helper.rb
 - app/helpers/spree/admin/stock_movements_helper.rb
 - app/helpers/spree/admin/store_credit_events_helper.rb
-- app/helpers/spree/promotion_rules_helper.rb
 - app/views/kaminari/solidus_admin/_first_page.html.erb
 - app/views/kaminari/solidus_admin/_gap.html.erb
 - app/views/kaminari/solidus_admin/_last_page.html.erb
@@ -497,54 +481,6 @@ files:
 - app/views/spree/admin/products/edit.html.erb
 - app/views/spree/admin/products/index.html.erb
 - app/views/spree/admin/products/new.html.erb
-- app/views/spree/admin/promotion_actions/create.js.erb
-- app/views/spree/admin/promotion_actions/destroy.js.erb
-- app/views/spree/admin/promotion_categories/_form.html.erb
-- app/views/spree/admin/promotion_categories/edit.html.erb
-- app/views/spree/admin/promotion_categories/index.html.erb
-- app/views/spree/admin/promotion_categories/new.html.erb
-- app/views/spree/admin/promotion_code_batches/_form_fields.html.erb
-- app/views/spree/admin/promotion_code_batches/download.csv.ruby
-- app/views/spree/admin/promotion_code_batches/index.html.erb
-- app/views/spree/admin/promotion_code_batches/new.html.erb
-- app/views/spree/admin/promotion_codes/index.csv.ruby
-- app/views/spree/admin/promotion_codes/index.html.erb
-- app/views/spree/admin/promotion_codes/new.html.erb
-- app/views/spree/admin/promotion_rules/create.js.erb
-- app/views/spree/admin/promotion_rules/destroy.js.erb
-- app/views/spree/admin/promotions/_actions.html.erb
-- app/views/spree/admin/promotions/_activations_edit.html.erb
-- app/views/spree/admin/promotions/_activations_new.html.erb
-- app/views/spree/admin/promotions/_form.html.erb
-- app/views/spree/admin/promotions/_promotion_action.html.erb
-- app/views/spree/admin/promotions/_promotion_rule.html.erb
-- app/views/spree/admin/promotions/_rules.html.erb
-- app/views/spree/admin/promotions/actions/_create_adjustment.html.erb
-- app/views/spree/admin/promotions/actions/_create_item_adjustments.html.erb
-- app/views/spree/admin/promotions/actions/_create_quantity_adjustments.html.erb
-- app/views/spree/admin/promotions/actions/_free_shipping.html.erb
-- app/views/spree/admin/promotions/actions/_promotion_calculators_with_custom_fields.html.erb
-- app/views/spree/admin/promotions/calculators/_default_fields.html.erb
-- app/views/spree/admin/promotions/calculators/distributed_amount/_fields.html.erb
-- app/views/spree/admin/promotions/calculators/flat_rate/_fields.html.erb
-- app/views/spree/admin/promotions/calculators/tiered_flat_rate/_fields.html.erb
-- app/views/spree/admin/promotions/calculators/tiered_percent/_fields.html.erb
-- app/views/spree/admin/promotions/edit.html.erb
-- app/views/spree/admin/promotions/index.html.erb
-- app/views/spree/admin/promotions/new.html.erb
-- app/views/spree/admin/promotions/rules/_first_order.html.erb
-- app/views/spree/admin/promotions/rules/_first_repeat_purchase_since.html.erb
-- app/views/spree/admin/promotions/rules/_item_total.html.erb
-- app/views/spree/admin/promotions/rules/_minimum_quantity.html.erb
-- app/views/spree/admin/promotions/rules/_nth_order.html.erb
-- app/views/spree/admin/promotions/rules/_one_use_per_user.html.erb
-- app/views/spree/admin/promotions/rules/_option_value.html.erb
-- app/views/spree/admin/promotions/rules/_product.html.erb
-- app/views/spree/admin/promotions/rules/_store.html.erb
-- app/views/spree/admin/promotions/rules/_taxon.html.erb
-- app/views/spree/admin/promotions/rules/_user.html.erb
-- app/views/spree/admin/promotions/rules/_user_logged_in.html.erb
-- app/views/spree/admin/promotions/rules/_user_role.html.erb
 - app/views/spree/admin/properties/_form.html.erb
 - app/views/spree/admin/properties/edit.html.erb
 - app/views/spree/admin/properties/filtered.html.erb
@@ -625,6 +561,11 @@ files:
 - app/views/spree/admin/shared/preference_fields/_password.html.erb
 - app/views/spree/admin/shared/preference_fields/_string.html.erb
 - app/views/spree/admin/shared/preference_fields/_text.html.erb
+- app/views/spree/admin/shared/search_fields/_checkbox.html.erb
+- app/views/spree/admin/shared/search_fields/_date_range_picker.html.erb
+- app/views/spree/admin/shared/search_fields/_select.html.erb
+- app/views/spree/admin/shared/search_fields/_text_field.html.erb
+- app/views/spree/admin/shared/search_fields/_variant_autocomplete.html.erb
 - app/views/spree/admin/shipping_categories/_form.html.erb
 - app/views/spree/admin/shipping_categories/edit.html.erb
 - app/views/spree/admin/shipping_categories/index.html.erb
@@ -912,14 +853,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: 1.8.23
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Admin interface for the Solidus e-commerce framework.

data/app/assets/javascripts/spree/backend/promotions/activation.js

@@ -1,26 +0,0 @@
-Spree.PromotionActivationView = Backbone.View.extend({
-  events: {
-    "change [name=activation_type]": "render"
-  },
-
-  initialize: function(){
-    this.render();
-  },
-
-  render: function(){
-    var activation_type = this.$("[name=activation_type]:checked").val();
-    this.$('[data-activation-type]').each(function(){
-      var selected = ($(this).data('activation-type') === activation_type);
-      $(this).find(':input').prop("disabled", !selected);
-      $(this).toggle(selected);
-    });
-  }
-});
-
-Spree.ready(function(){
-  if($("#js_promotion_activation").length) {
-    new Spree.PromotionActivationView({
-      el: $("#js_promotion_activation")
-    });
-  }
-});

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

@@ -1,35 +0,0 @@
-// This is called on page load and via an ajax request in
-// app/views/spree/admin/promotion_actions/create.js.erb
-window.initPromotionActions = function() {
-  $('#promotion-filters').find('.variant_autocomplete').variantAutocomplete();
-
-  $('.promo-rule-option-values').each(function() {
-    if (!$(this).data('has-view')) {
-      $(this).data('has-view', true);
-      new Spree.Views.Promotions.OptionValuesRule({
-        el: this
-      });
-    }
-  });
-
-  $('.js-tiered-calculator').each(function() {
-    if (!$(this).data('has-view')) {
-      $(this).data('has-view', true);
-      new Spree.Views.Calculators.Tiered({
-        el: this
-      });
-    }
-  });
-};
-
-Spree.ready(function() {
-  // Add classes to boxes when hovering over delete
-  $('#promotion-filters').on('mouseover', 'a.delete', function(event) {
-    $(this).parent().addClass('action-remove');
-  });
-  $('#promotion-filters').on('mouseout', 'a.delete', function(event) {
-    $(this).parent().removeClass('action-remove');
-  });
-
-  window.initPromotionActions();
-});

data/app/assets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_flat_rate.hbs

@@ -1,23 +0,0 @@
-<div class="fullwidth tier">
-  <a class="fa fa-trash remove js-remove-tier"></a>
-  <div class="row">
-    <div class="col-6">
-      <div class="input-group">
-        <div class="input-group-prepend">
-          <span class="input-group-text">$</span>
-        </div>
-        <input class="js-base-input form-control" type="text" value={{baseField.value}}>
-      </div>
-    </div>
-    <div class="col-6">
-      <div class="input-group">
-        <div class="input-group-prepend">
-          <span class="input-group-text">$</span>
-        </div>
-        <input class="js-value-input form-control"
-          name="{{valueField.name}}" type="text" value={{valueField.value}}>
-      </div>
-    </div>
-  </div>
-  <div class="clear"></div>
-</div>

data/app/assets/javascripts/spree/backend/templates/promotions/calculators/fields/tiered_percent.hbs

@@ -1,23 +0,0 @@
-<div class="fullwidth tier">
-  <a class="fa fa-trash remove js-remove-tier"></a>
-  <div class="row">
-    <div class="col-6">
-      <div class="input-group">
-        <div class="input-group-prepend">
-          <span class="input-group-text">$</span>
-        </div>
-        <input class="js-base-input form-control" type="text" value={{baseField.value}}>
-      </div>
-    </div>
-    <div class="col-6">
-      <div class="input-group">
-        <input class="js-value-input form-control right-align"
-          name="{{valueField.name}}" type="text" value={{valueField.value}}>
-        <div class="input-group-append">
-          <span class="input-group-text">%</span>
-        </div>
-      </div>
-    </div>
-  </div>
-  <div class="clear"></div>
-</div>

data/app/assets/javascripts/spree/backend/templates/promotions/rules/option_values.hbs

@@ -1,12 +0,0 @@
-<div class="fullwidth promo-rule-option-value">
-  <div class="row">
-    <div class="col-6">
-      <input class="js-promo-rule-option-value-product-select fullwidth" type="hidden" value="{{ productSelect.value }}">
-    </div>
-    <div class="col-5">
-      <input class="js-promo-rule-option-value-option-values-select fullwidth" name="{{ paramPrefix }}[preferred_eligible_values][{{ productSelect.value }}]" type="hidden" value={{optionValuesSelect.value}}>
-    </div>
-  </div>
-  <a class="fa fa-trash remove js-remove-promo-rule-option-value"></a>
-  <div class="clear"></div>
-</div>

data/app/assets/javascripts/spree/backend/views/calculators/tiered.js

@@ -1,54 +0,0 @@
-Spree.Views.Calculators.Tiered = Backbone.View.extend({
-  initialize: function() {
-    this.calculatorName = this.$('.js-tiers').data('calculator');
-    this.tierFieldsTemplate = HandlebarsTemplates["promotions/calculators/fields/" + this.calculatorName];
-    this.originalTiers = this.$('.js-tiers').data('original-tiers');
-    this.formPrefix = this.$('.js-tiers').data('form-prefix');
-
-    for (var base in this.originalTiers) {
-      var value = this.originalTiers[base];
-      this.$('.js-tiers').append(
-        this.tierFieldsTemplate({
-          baseField: {
-            value: base
-          },
-          valueField: {
-            name: this.tierInputName(base),
-            value: value
-          }
-        })
-      );
-    }
-  },
-
-  events: {
-    'click .js-add-tier': 'onAdd',
-    'click .js-remove-tier': 'onRemove',
-    'change .js-base-input': 'onChange'
-  },
-
-  tierInputName: function(base) {
-    return this.formPrefix + "[calculator_attributes][preferred_tiers][" + base + "]";
-  },
-
-  onAdd: function(event) {
-    event.preventDefault();
-    this.$('.js-tiers').append(
-      this.tierFieldsTemplate({
-        valueField: {
-          name: null
-        }
-      })
-    );
-  },
-
-  onRemove: function(event) {
-    event.preventDefault();
-    $(event.target).parents('.tier').remove();
-  },
-
-  onChange: function(event) {
-    var valueInput = $(event.target).parents('.tier').find('.js-value-input');
-    valueInput.attr('name', this.tierInputName($(event.target).val()));
-  }
-});

data/app/assets/javascripts/spree/backend/views/promotions/option_values_rule.js

@@ -1,79 +0,0 @@
-Spree.Views.Promotions.OptionValuesRuleRow = Backbone.View.extend({
-  optionValueTemplate: HandlebarsTemplates['promotions/rules/option_values'],
-
-  events: {
-    'click .js-remove-promo-rule-option-value': 'onRemove',
-    'change .js-promo-rule-option-value-product-select': 'onSelectProduct'
-  },
-
-  initialize: function(options) {
-    this.productId = options.productId;
-    this.values = options.values;
-    this.paramPrefix = options.paramPrefix;
-  },
-
-  render: function() {
-    this.$el.html(
-      this.optionValueTemplate({
-        productSelect: { value: this.productId },
-        optionValuesSelect: { value: this.values },
-        paramPrefix: this.paramPrefix
-      })
-    );
-
-    this.$('.js-promo-rule-option-value-product-select').productAutocomplete({multiple: false});
-
-    var productSelect = this.$el.find(".js-promo-rule-option-value-product-select")
-
-    this.$('.js-promo-rule-option-value-option-values-select').optionValueAutocomplete({ productSelect })
-
-    if(this.productId == null) {
-      this.$('.js-promo-rule-option-value-option-values-select').prop('disabled', true);
-    }
-  },
-
-  onSelectProduct: function(e) {
-    this.productId = this.$('input.js-promo-rule-option-value-product-select').val();
-    this.render();
-  },
-
-  onRemove: function(e) {
-    this.remove();
-  },
-});
-
-Spree.Views.Promotions.OptionValuesRule = Backbone.View.extend({
-  initialize: function() {
-    _.bindAll(this, 'addOptionValue')
-    this.$optionValues = this.$('.js-promo-rule-option-values');
-    this.paramPrefix = this.$('.param-prefix').data('param-prefix');
-
-    var originalOptionValues = this.$optionValues.data('original-option-values')
-    if ($.isEmptyObject(originalOptionValues)) {
-      this.addOptionValue(null, null);
-    } else {
-      $.each(originalOptionValues, this.addOptionValue);
-    }
-  },
-
-  events: {
-    'click .js-add-promo-rule-option-value': 'onAdd'
-  },
-
-  addOptionValue: function(product, values) {
-    var row = new Spree.Views.Promotions.OptionValuesRuleRow({
-      productId: product,
-      values: values,
-      paramPrefix: this.paramPrefix
-    });
-
-    this.$optionValues.append(row.el);
-
-    row.render();
-  },
-
-  onAdd: function(e) {
-    e.preventDefault();
-    this.addOptionValue(null, null);
-  },
-});