solidus_friendly_promotions 1.0.0.rc.1 → 1.0.0.rc.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac98e07030bf9f63775dafdffc94d3a6be02b8050664037469f57a32dc71da43
-  data.tar.gz: fdd1d7e3fbbfc92cb347af92c28c5f518d91724a330408a576d47449c6e8f201
+  metadata.gz: bb47848b0ee568a1116d827ac87f0071afd5790eff84d501860c0ed68eb37ac1
+  data.tar.gz: fd5c9d4ac486641ab72f87129cfbf7a7a44ea5b3c1a18970c479794f410dcd9f
 SHA512:
-  metadata.gz: c9eb24c1fabf89ee0b61731b8541e1459dfe9d508ffc2721f8f1384df382c1653b94f407c04438a2047ebf0fc868e4849fc5f88b821ab141eac44b21bde910b9
-  data.tar.gz: 1e89490f9daf5ad6480b37bc47581bb7ba4a948bb1af7aa7b9539b3c094c6549db4055132b53155e3fc419f881b71d64c81577ba447d188e704eda176bd5b808
+  metadata.gz: 71269bc48e02192efa3d41c83fe461bed7b3b0c8b1d123cfa555671ee5baea159f7e49521d203124ec1c23e2bedecc641e2a6b44ff5b18ad013438c2255fee50
+  data.tar.gz: 91b12062bff9c7324c9efdce8398ce6eac5ffd50b353848b1249c9a4146411b137c8354fee594861d03f490db9e4a05d0556f5bade2160596d04c56a7e3c452b

data/.circleci/config.yml

@@ -21,7 +21,7 @@ jobs:
       - checkout
       - solidusio_extensions/dependencies
       - solidusio_extensions/run-tests-solidus-current
-      - solidusio_extensions/run-tests-solidus-main
+      # - solidusio_extensions/run-tests-solidus-main
   run-specs-with-postgres:
     executor:
       name: solidusio_extensions/postgres
@@ -31,7 +31,7 @@ jobs:
       - checkout
       - solidusio_extensions/dependencies
       - solidusio_extensions/run-tests-solidus-current
-      - solidusio_extensions/run-tests-solidus-main
+      # - solidusio_extensions/run-tests-solidus-main
   run-specs-with-sqlite:
     executor:
       name: solidusio_extensions/sqlite
@@ -41,7 +41,7 @@ jobs:
       - checkout
       - solidusio_extensions/dependencies
       - solidusio_extensions/run-tests-solidus-current
-      - solidusio_extensions/run-tests-solidus-main
+      # - solidusio_extensions/run-tests-solidus-main
 workflows:
   Run specs on supported Solidus versions:
     jobs:

data/CHANGELOG.md

@@ -1 +1,113 @@
 # Changelog
+
+## [Unreleased](https://github.com/FriendlyCart/solidus_friendly_promotions/tree/HEAD)
+
+## [v1.0.0.rc.2](https://github.com/FriendlyCart/solidus_friendly_promotions/tree/v1.0.0.rc.3) (2024-01-16)
+
+**Merged pull requests:**
+
+- Add configuration option: `recalculate_complete_orders` [\#97](https://github.com/friendlycart/solidus_friendly_promotions/pull/97) ([mamhoff](https://github.com/mamhoff))
+- Fix standardrb violations [\#96](https://github.com/friendlycart/solidus_friendly_promotions/pull/96) ([mamhoff](https://github.com/mamhoff))
+- Fix admin sub menu entry visibility condition [\#92](https://github.com/friendlycart/solidus_friendly_promotions/pull/92) ([mickenorlen](https://github.com/mickenorlen))
+- Documentation fixes [\#91](https://github.com/friendlycart/solidus_friendly_promotions/pull/91) ([mamhoff](https://github.com/mamhoff))
+- Fix typo [\#89](https://github.com/friendlycart/solidus_friendly_promotions/pull/89) ([jarednorman](https://github.com/jarednorman))
+- Pass untranslated strings through i18n [\#88](https://github.com/friendlycart/solidus_friendly_promotions/pull/88) ([mamhoff](https://github.com/mamhoff))
+
+## [v1.0.0.rc.2](https://github.com/FriendlyCart/solidus_friendly_promotions/tree/v1.0.0.rc.2) (2023-11-11)
+
+[Full Changelog](https://github.com/FriendlyCart/solidus_friendly_promotions/compare/v1.0.0.rc.1...v1.0.0.rc.2)
+
+**Merged pull requests:**
+
+- Refactor: Extract `Promotion#applicable_line_items` [\#86](https://github.com/friendlycart/solidus_friendly_promotions/pull/86) ([mamhoff](https://github.com/mamhoff))
+- Coupon Promo Handler: Fix flaky spec [\#84](https://github.com/friendlycart/solidus_friendly_promotions/pull/84) ([mamhoff](https://github.com/mamhoff))
+- Use Remix icons if Solidus' admin\_updated\_navbar is enabled [\#83](https://github.com/friendlycart/solidus_friendly_promotions/pull/83) ([tvdeyen](https://github.com/tvdeyen))
+- Tiered calculators [\#82](https://github.com/friendlycart/solidus_friendly_promotions/pull/82) ([mamhoff](https://github.com/mamhoff))
+- Allow changing quantity for automatic line items [\#81](https://github.com/friendlycart/solidus_friendly_promotions/pull/81) ([mamhoff](https://github.com/mamhoff))
+- Update MIGRATING.md [\#80](https://github.com/friendlycart/solidus_friendly_promotions/pull/80) ([tvdeyen](https://github.com/tvdeyen))
+- Promotions index improvements [\#79](https://github.com/friendlycart/solidus_friendly_promotions/pull/79) ([mamhoff](https://github.com/mamhoff))
+- Lint: Fix standardrb error [\#78](https://github.com/friendlycart/solidus_friendly_promotions/pull/78) ([mamhoff](https://github.com/mamhoff))
+
+## [v1.0.0.rc.1](https://github.com/FriendlyCart/solidus_friendly_promotions/tree/v1.0.0.rc.1) (2023-11-07)
+
+[Full Changelog](https://github.com/FriendlyCart/solidus_friendly_promotions/compare/v1.0.0.pre...v1.0.0.rc.1)
+
+**Merged pull requests:**
+
+- Goodies! [\#75](https://github.com/friendlycart/solidus_friendly_promotions/pull/75) ([mamhoff](https://github.com/mamhoff))
+- Add a null promotion handler [\#71](https://github.com/friendlycart/solidus_friendly_promotions/pull/71) ([mamhoff](https://github.com/mamhoff))
+
+## [v1.0.0.pre](https://github.com/FriendlyCart/solidus_friendly_promotions/tree/v1.0.0.pre) (2023-11-07)
+
+[Full Changelog](https://github.com/FriendlyCart/solidus_friendly_promotions/compare/e14802957fdb55d7f4e2730341e4cbb118ebf993...v1.0.0.pre)
+
+**Merged pull requests:**
+
+- Use new NestedClassSet for configuring calculators [\#77](https://github.com/friendlycart/solidus_friendly_promotions/pull/77) ([mamhoff](https://github.com/mamhoff))
+- Refactor to FriendlyPromotion::FriendlyPromotionAdjuster [\#76](https://github.com/friendlycart/solidus_friendly_promotions/pull/76) ([mamhoff](https://github.com/mamhoff))
+- Add bundler/gem\_tasks [\#74](https://github.com/friendlycart/solidus_friendly_promotions/pull/74) ([mamhoff](https://github.com/mamhoff))
+- Fix order discounter spec [\#73](https://github.com/friendlycart/solidus_friendly_promotions/pull/73) ([mamhoff](https://github.com/mamhoff))
+- Quantity tiered calculator [\#72](https://github.com/friendlycart/solidus_friendly_promotions/pull/72) ([mamhoff](https://github.com/mamhoff))
+- Add PromotionHandler::Page [\#70](https://github.com/friendlycart/solidus_friendly_promotions/pull/70) ([mamhoff](https://github.com/mamhoff))
+- Never create adjustments with a zero amount [\#69](https://github.com/friendlycart/solidus_friendly_promotions/pull/69) ([mamhoff](https://github.com/mamhoff))
+- Ignore shipping rates that have no cost [\#68](https://github.com/friendlycart/solidus_friendly_promotions/pull/68) ([davecandlescience](https://github.com/davecandlescience))
+- Refactor promotions eligibility [\#67](https://github.com/friendlycart/solidus_friendly_promotions/pull/67) ([mamhoff](https://github.com/mamhoff))
+- Refactor order promotions migrator [\#66](https://github.com/friendlycart/solidus_friendly_promotions/pull/66) ([mamhoff](https://github.com/mamhoff))
+- Add migrate order promotions rake task [\#65](https://github.com/friendlycart/solidus_friendly_promotions/pull/65) ([davecandlescience](https://github.com/davecandlescience))
+- Add missing relation: SolidusFriendlyPromotions\#order\_promotions [\#64](https://github.com/friendlycart/solidus_friendly_promotions/pull/64) ([mamhoff](https://github.com/mamhoff))
+- Promo Migrator: Ignore missing rules and actions [\#63](https://github.com/friendlycart/solidus_friendly_promotions/pull/63) ([mamhoff](https://github.com/mamhoff))
+- Improve spec for product rule [\#62](https://github.com/friendlycart/solidus_friendly_promotions/pull/62) ([mamhoff](https://github.com/mamhoff))
+- Do not call Spree::PromotionHandler::Shipping when SFP is active [\#61](https://github.com/friendlycart/solidus_friendly_promotions/pull/61) ([mamhoff](https://github.com/mamhoff))
+- Add a migration guide [\#60](https://github.com/friendlycart/solidus_friendly_promotions/pull/60) ([mamhoff](https://github.com/mamhoff))
+- Add a PromotionHandler::Coupon [\#59](https://github.com/friendlycart/solidus_friendly_promotions/pull/59) ([mamhoff](https://github.com/mamhoff))
+- Backports minimum quantity promotion rule from Solidus [\#58](https://github.com/friendlycart/solidus_friendly_promotions/pull/58) ([mamhoff](https://github.com/mamhoff))
+- Backport promotion code batch fix from Solidus [\#57](https://github.com/friendlycart/solidus_friendly_promotions/pull/57) ([mamhoff](https://github.com/mamhoff))
+- Add a rake task to migrate adjustments from legacy promotions [\#56](https://github.com/friendlycart/solidus_friendly_promotions/pull/56) ([mamhoff](https://github.com/mamhoff))
+- Add missing shipping\_rate translation [\#55](https://github.com/friendlycart/solidus_friendly_promotions/pull/55) ([davecandlescience](https://github.com/davecandlescience))
+- Fix shipping rate discount factory [\#54](https://github.com/friendlycart/solidus_friendly_promotions/pull/54) ([mamhoff](https://github.com/mamhoff))
+- Order Discounter: Create valid shipping rate discounts [\#53](https://github.com/friendlycart/solidus_friendly_promotions/pull/53) ([mamhoff](https://github.com/mamhoff))
+- FriendlyPromotionDiscounter: Always return @order [\#52](https://github.com/friendlycart/solidus_friendly_promotions/pull/52) ([mamhoff](https://github.com/mamhoff))
+- Line Item Product Rule: Add error messaging [\#50](https://github.com/friendlycart/solidus_friendly_promotions/pull/50) ([mamhoff](https://github.com/mamhoff))
+- Fix: SolidusFriendlyPromotions, not Shipping [\#49](https://github.com/friendlycart/solidus_friendly_promotions/pull/49) ([mamhoff](https://github.com/mamhoff))
+- Import eligiblity error messages from Solidus [\#48](https://github.com/friendlycart/solidus_friendly_promotions/pull/48) ([mamhoff](https://github.com/mamhoff))
+- Faster promotion code migration [\#47](https://github.com/friendlycart/solidus_friendly_promotions/pull/47) ([mamhoff](https://github.com/mamhoff))
+- Migrator: Store original promotion and promotion action [\#46](https://github.com/friendlycart/solidus_friendly_promotions/pull/46) ([mamhoff](https://github.com/mamhoff))
+- Lint with standardrb in CI [\#45](https://github.com/friendlycart/solidus_friendly_promotions/pull/45) ([mamhoff](https://github.com/mamhoff))
+- Migrator: Migrate promotion codes and promotion code batches [\#44](https://github.com/friendlycart/solidus_friendly_promotions/pull/44) ([mamhoff](https://github.com/mamhoff))
+- Migrate promotion categories and association [\#43](https://github.com/friendlycart/solidus_friendly_promotions/pull/43) ([davecandlescience](https://github.com/davecandlescience))
+- On the fly order promotions [\#42](https://github.com/friendlycart/solidus_friendly_promotions/pull/42) ([mamhoff](https://github.com/mamhoff))
+- Add back references to promotions and actions [\#41](https://github.com/friendlycart/solidus_friendly_promotions/pull/41) ([davecandlescience](https://github.com/davecandlescience))
+- Fix spec warning in promotion rules spec [\#40](https://github.com/friendlycart/solidus_friendly_promotions/pull/40) ([mamhoff](https://github.com/mamhoff))
+- Transparently replace promotion adjustments [\#39](https://github.com/friendlycart/solidus_friendly_promotions/pull/39) ([mamhoff](https://github.com/mamhoff))
+- Add DB comments to tables [\#38](https://github.com/friendlycart/solidus_friendly_promotions/pull/38) ([mamhoff](https://github.com/mamhoff))
+- Fix Promotion Map [\#36](https://github.com/friendlycart/solidus_friendly_promotions/pull/36) ([mamhoff](https://github.com/mamhoff))
+- Fix specs [\#29](https://github.com/friendlycart/solidus_friendly_promotions/pull/29) ([mamhoff](https://github.com/mamhoff))
+- Add Promotion Migrator [\#28](https://github.com/friendlycart/solidus_friendly_promotions/pull/28) ([mamhoff](https://github.com/mamhoff))
+- Polyvalent rules [\#27](https://github.com/friendlycart/solidus_friendly_promotions/pull/27) ([mamhoff](https://github.com/mamhoff))
+- Fix Turbo frame tags for Turbo 1.5 [\#26](https://github.com/friendlycart/solidus_friendly_promotions/pull/26) ([mamhoff](https://github.com/mamhoff))
+- Allow destroying promotions [\#25](https://github.com/friendlycart/solidus_friendly_promotions/pull/25) ([mamhoff](https://github.com/mamhoff))
+- Fix class name option in line item taxon association [\#24](https://github.com/friendlycart/solidus_friendly_promotions/pull/24) ([mamhoff](https://github.com/mamhoff))
+- Move factories to factories folder [\#23](https://github.com/friendlycart/solidus_friendly_promotions/pull/23) ([mamhoff](https://github.com/mamhoff))
+- Add links to legacy promotions in Solidus 4.1 [\#22](https://github.com/friendlycart/solidus_friendly_promotions/pull/22) ([mamhoff](https://github.com/mamhoff))
+- Make lanes configurable [\#21](https://github.com/friendlycart/solidus_friendly_promotions/pull/21) ([mamhoff](https://github.com/mamhoff))
+- Allow order rules per lane [\#20](https://github.com/friendlycart/solidus_friendly_promotions/pull/20) ([mamhoff](https://github.com/mamhoff))
+- Add PermissionSet for Friendly Promotions [\#19](https://github.com/friendlycart/solidus_friendly_promotions/pull/19) ([mamhoff](https://github.com/mamhoff))
+- Add "only" match policy to product rule [\#18](https://github.com/friendlycart/solidus_friendly_promotions/pull/18) ([mamhoff](https://github.com/mamhoff))
+- Require solidus [\#17](https://github.com/friendlycart/solidus_friendly_promotions/pull/17) ([mamhoff](https://github.com/mamhoff))
+- Customer label [\#16](https://github.com/friendlycart/solidus_friendly_promotions/pull/16) ([mamhoff](https://github.com/mamhoff))
+- System specs with turbo [\#15](https://github.com/friendlycart/solidus_friendly_promotions/pull/15) ([mamhoff](https://github.com/mamhoff))
+- Reference our own I18n namespace in views [\#14](https://github.com/friendlycart/solidus_friendly_promotions/pull/14) ([mamhoff](https://github.com/mamhoff))
+- Use different path for friendly promotions [\#13](https://github.com/friendlycart/solidus_friendly_promotions/pull/13) ([mamhoff](https://github.com/mamhoff))
+- Add dependent: :destroy to Spree::Order\#friendly\_promotions [\#12](https://github.com/friendlycart/solidus_friendly_promotions/pull/12) ([mamhoff](https://github.com/mamhoff))
+- Extract promotion loading from promo discounter [\#11](https://github.com/friendlycart/solidus_friendly_promotions/pull/11) ([mamhoff](https://github.com/mamhoff))
+- Remove delegators [\#10](https://github.com/friendlycart/solidus_friendly_promotions/pull/10) ([mamhoff](https://github.com/mamhoff))
+- Fix standardrb error in promotion rule spec [\#8](https://github.com/friendlycart/solidus_friendly_promotions/pull/8) ([mamhoff](https://github.com/mamhoff))
+- Stacking Promotions [\#7](https://github.com/friendlycart/solidus_friendly_promotions/pull/7) ([mamhoff](https://github.com/mamhoff))
+- Add "Lane" enum to Promotion [\#6](https://github.com/friendlycart/solidus_friendly_promotions/pull/6) ([mamhoff](https://github.com/mamhoff))
+- Lint using standardrb gem [\#5](https://github.com/friendlycart/solidus_friendly_promotions/pull/5) ([mamhoff](https://github.com/mamhoff))
+- Promotion Actions: Implement "edit" action [\#4](https://github.com/friendlycart/solidus_friendly_promotions/pull/4) ([mamhoff](https://github.com/mamhoff))
+- Initializer: Use new MenuItem API from Solidus 4.2 onwards [\#3](https://github.com/friendlycart/solidus_friendly_promotions/pull/3) ([mamhoff](https://github.com/mamhoff))
+
+
+
+\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

data/MIGRATING.md

@@ -23,7 +23,7 @@ For the time being, comment out the following lines:
 
 ```rb
 # Spree::Config.order_contents_class = "SolidusFriendlyPromotions::SimpleOrderContents"
-# Spree::Config.promotion_adjuster_class = "SolidusFriendlyPromotions::OrderDiscounter"
+# Spree::Config.promotion_adjuster_class = "SolidusFriendlyPromotions::FriendlyPromotionAdjuster"
 ```
 
 This makes sure that the behavior of the current promotion system does not change - yet.
@@ -46,7 +46,7 @@ Now, change `config/initializers/solidus_friendly_promotions.rb` to use your new
 # Stops running the stock `Spree::PromotionHandler::Cart`
 Spree::Config.order_contents_class = "SolidusFriendlyPromotions::SimpleOrderContents"
 # Adjusts all items in an order according to the currently eligible promotions
-Spree::Config.promotion_adjuster_class = "SolidusFriendlyPromotions::OrderDiscounter"
+Spree::Config.promotion_adjuster_class = "SolidusFriendlyPromotions::FriendlyPromotionAdjuster"
 ```
 
 From a user's perspective, your promotions should work as before.
@@ -68,6 +68,10 @@ bundle exec rails solidus_friendly_promotions:migrate_order_promotions:down
 
 Both of these tasks only work if every promotion and promotion action have an equivalent in SolidusFrienndlyPromotions. Promotion Actions are connected to their originals using the `SolidusFriendlyPromotions#original_promotion_action_id`, Promotions are connected to their originals using the  `SolidusFriendlyPromotions#original_promotion_id`.
 
+## Solidus Starter Frontend (and other custom frontends)
+
+Stores that have a custom coupon codes controller, such as Solidus' starter frontend, have to change the coupon promotion handler to the one from this gem. If you are on a very recent Solidus version, you can change any reference to `Spree::PromotionHandler::Coupon` to `Spree::Config.coupon_code_handler_class`. If your version of Solidus does not have that method yet, replace `Spree::PromotionHandler::Coupon` with `SolidusFriendlyPromotions::PromotionHandler::Coupon`
+
 ## Migrating custom rules and actions
 
 If you have custom promotion rules or actions, you need to create new promotion rules and actions.
@@ -90,7 +94,7 @@ end
 would become:
 
 ```rb
-class MyNewRule < SolidusFriendlyShipping::PromotionRule
+class MyNewRule < SolidusFriendlyPromotions::PromotionRule
   include LineItemLevelRule
   def eligible?(promotable)
     promotable.quantity > 3

data/README.md

@@ -8,7 +8,7 @@ The basic architecture is very similar to the one in core Solidus, but with a fe
 
 ## Architecture
 
-This extension centralizes promotion handling in the order updater. A service class, the `SolidusFriendlyPromotions::OrderDiscounter` applies the current promotion configuration to the order, adjusting or removing adjustments as necessary.
+This extension centralizes promotion handling in the order updater. A service class, the `SolidusFriendlyPromotions::FriendlyPromotionAdjuster` applies the current promotion configuration to the order, adjusting or removing adjustments as necessary.
 
 In Solidus Core, Promotion adjustments get recalculated twice on every change to the cart; once in `Spree::OrderContents#after_add_or_remove` and in `Spree::OrderUpdater#update_promotions`. To make things more complicated, `Spree::OrderContents` leverages the `Spree::PromotionHandler#cart`, while the order updater goes through `Spree::Adjustment#recalculate`.
 
@@ -51,13 +51,22 @@ One way of connecting orders to promotions is via a promotion code.
 
 Promotion categories simply allow admins to group promotion actions. They have no further significance with regards to the functionality of the promotion system. This is the same behavior as in core.
 
+### Promotion recalculation
+
+Solidus allows changing orders up until when they are shipped. SolidusFriendlyPromotions therefore will recalculate orders up until when they are shipped as well. If your admins change promotions rather than add new ones and carefully manage the start and end dates of promotions, you might want to disable this feature:
+
+```rb
+SolidusFriendlyPromotions.configure do |config|
+  config.recalculate_complete_orders = false
+end
+```
 
 ## Installation
 
 Add solidus_friendly_promotions to your Gemfile:
 
 ```ruby
-gem 'solidus_friendly_promotions', github: 'friendlycart/solidus_friendly_promotion', branch: 'main'
+gem 'solidus_friendly_promotions'
 ```
 
 Once this project is out of the research phase, a proper gem release will follow.
@@ -71,7 +80,7 @@ bin/rails generate solidus_friendly_promotions:install
 This will create the tables for this extension. It will also replace the promotion administration system under
 `/admin/promotions` with a new one that needs `turbo-rails`.
 
-It will also create an initializer within which Solidus is configured to use this extension's `SimpleOrderContents` and `OrderDiscounter` classes. Feel free to override with your own implementations!
+It will also create an initializer within which Solidus is configured to use this extension's `SimpleOrderContents` and `FriendlyPromotionAdjuster` classes. Feel free to override with your own implementations!
 
 ## Usage
 

data/app/controllers/solidus_friendly_promotions/admin/base_controller.rb

@@ -7,7 +7,7 @@ module SolidusFriendlyPromotions
         @parent ||= self.class.parent_data[:model_class]
           .includes(self.class.parent_data[:includes])
           .find_by!(self.class.parent_data[:find_by] => params["#{parent_model_name}_id"])
-        instance_variable_set("@#{parent_model_name}", @parent)
+        instance_variable_set(:"@#{parent_model_name}", @parent)
       rescue ActiveRecord::RecordNotFound => e
         resource_not_found(flash_class: e.model.constantize, redirect_url: routes_proxy.polymorphic_url([:admin, parent_model_name.pluralize.to_sym]))
       end

data/app/controllers/solidus_friendly_promotions/admin/promotion_rules_controller.rb

@@ -63,7 +63,7 @@ module SolidusFriendlyPromotions
 
       def validate_promotion_rule_type
         requested_type = params[:promotion_rule].delete(:type)
-        promotion_rule_types = SolidusFriendlyPromotions.config.send("#{@level}_rules")
+        promotion_rule_types = SolidusFriendlyPromotions.config.send(:"#{@level}_rules")
         @promotion_rule_type = promotion_rule_types.detect do |klass|
           klass.name == requested_type
         end

data/app/controllers/solidus_friendly_promotions/admin/promotions_controller.rb

@@ -32,7 +32,7 @@ module SolidusFriendlyPromotions
         return @collection if @collection
 
         params[:q] ||= HashWithIndifferentAccess.new
-        params[:q][:s] ||= "id desc"
+        params[:q][:s] ||= "updated_at desc"
 
         @collection = super
         @search = @collection.ransack(params[:q])

data/app/decorators/models/solidus_friendly_promotions/line_item_decorator.rb

@@ -3,18 +3,24 @@
 module SolidusFriendlyPromotions
   module LineItemDecorator
     def self.prepended(base)
+      base.attr_accessor :quantity_setter
       base.belongs_to :managed_by_order_action, class_name: "SolidusFriendlyPromotions::PromotionAction", optional: true
       base.validate :validate_managed_quantity_same, on: :update
+      base.after_save :reset_quantity_setter
     end
 
     private
 
     def validate_managed_quantity_same
-      if managed_by_order_action && quantity_changed?
+      if managed_by_order_action && quantity_changed? && quantity_setter != managed_by_order_action
         errors.add(:quantity, :cannot_be_changed_for_automated_items)
       end
     end
 
+    def reset_quantity_setter
+      @quantity_setter = nil
+    end
+
     Spree::LineItem.prepend self
     Spree::LineItem.prepend SolidusFriendlyPromotions::DiscountableAmount
   end

data/app/helpers/solidus_friendly_promotions/admin/promotion_rules_helper.rb

@@ -5,7 +5,7 @@ module SolidusFriendlyPromotions
     module PromotionRulesHelper
       def options_for_promotion_rule_types(promotion_rule, level)
         existing = promotion_rule.promotion.rules.select(&:persisted?).map { |rule| rule.class.name }
-        rules = SolidusFriendlyPromotions.config.send("#{level}_rules").reject { |rule| existing.include? rule.name }
+        rules = SolidusFriendlyPromotions.config.send(:"#{level}_rules").reject { |rule| existing.include? rule.name }
         options = rules.map { |rule| [rule.model_name.human, rule.name] }
         options_for_select(options, promotion_rule.type.to_s)
       end

data/app/models/concerns/solidus_friendly_promotions/calculators/promotion_calculator.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module SolidusFriendlyPromotions
+  module Calculators
+    module PromotionCalculator
+      def description
+        self.class.human_attribute_name(:description)
+      end
+    end
+  end
+end

data/app/models/concerns/solidus_friendly_promotions/rules/line_item_applicable_order_rule.rb

@@ -12,7 +12,7 @@ module SolidusFriendlyPromotions
       end
 
       def eligible?(promotable)
-        send("#{promotable.class.name.demodulize.underscore}_eligible?", promotable)
+        send(:"#{promotable.class.name.demodulize.underscore}_eligible?", promotable)
       end
 
       def level

data/app/models/solidus_friendly_promotions/actions/adjust_line_item_quantity_groups.rb

@@ -58,7 +58,7 @@ module SolidusFriendlyPromotions
         adjustment_amount = adjustment_amount.abs
 
         order = line_item.order
-        line_items = actionable_line_items(order)
+        line_items = promotion.applicable_line_items(order)
 
         item_units = line_items.sort_by do |line_item|
           [-line_item.quantity, line_item.id]
@@ -78,14 +78,6 @@ module SolidusFriendlyPromotions
 
       private
 
-      def actionable_line_items(order)
-        order.discountable_line_items.select do |item|
-          promotion.rules.select do |rule|
-            rule.applicable?(item)
-          end.all? { |rule| rule.eligible?(item) }
-        end
-      end
-
       ##
       # Used specifically for PercentOnLineItem calculator. That calculator uses
       # `line_item.amount`, however we might not necessarily want to discount the

data/app/models/solidus_friendly_promotions/actions/create_discounted_item.rb

@@ -6,9 +6,11 @@ module SolidusFriendlyPromotions
       include OrderLevelAction
       preference :variant_id, :integer
       preference :quantity, :integer, default: 1
+      preference :necessary_quantity, :integer, default: 1
 
       def perform(order)
         line_item = find_item(order) || create_item(order)
+        set_quantity(line_item, determine_item_quantity(order))
         line_item.current_discounts << discount(line_item)
       end
 
@@ -24,7 +26,20 @@ module SolidusFriendlyPromotions
       end
 
       def create_item(order)
-        order.line_items.create!(quantity: preferred_quantity, variant: variant, managed_by_order_action: self)
+        order.line_items.create!(quantity: determine_item_quantity(order), variant: variant, managed_by_order_action: self)
+      end
+
+      def determine_item_quantity(order)
+        applicable_line_items = promotion.applicable_line_items(order)
+        # Integer division will floor automatically, which is what we want here:
+        # 1 Item, 2 needed: 1 * 1 / 2 => 0
+        # 5 items, 2 preferred, 2 needed: 5 / 2 * 2 => 4
+        applicable_line_items.sum(&:quantity) / preferred_necessary_quantity * preferred_quantity
+      end
+
+      def set_quantity(line_item, quantity)
+        line_item.quantity_setter = self
+        line_item.quantity = quantity
       end
 
       def variant

data/app/models/solidus_friendly_promotions/calculators/distributed_amount.rb

@@ -9,6 +9,8 @@ require_dependency "spree/calculator"
 module SolidusFriendlyPromotions
   module Calculators
     class DistributedAmount < Spree::Calculator
+      include PromotionCalculator
+
       preference :amount, :decimal, default: 0
       preference :currency, :string, default: -> { Spree::Config[:currency] }
 
@@ -16,7 +18,7 @@ module SolidusFriendlyPromotions
         return 0 unless line_item
         return 0 unless preferred_currency.casecmp(line_item.currency).zero?
 
-        distributable_line_items = eligible_line_items(line_item.order)
+        distributable_line_items = calculable.promotion.applicable_line_items(line_item.order)
         return 0 unless line_item.in?(distributable_line_items)
 
         DistributedAmountsHandler.new(
@@ -24,14 +26,6 @@ module SolidusFriendlyPromotions
           preferred_amount
         ).amount(line_item)
       end
-
-      private
-
-      def eligible_line_items(order)
-        order.discountable_line_items.select do |line_item|
-          calculable.promotion.eligible_by_applicable_rules?(line_item)
-        end
-      end
     end
   end
 end

data/app/models/solidus_friendly_promotions/calculators/flat_rate.rb

@@ -5,6 +5,8 @@ require_dependency "spree/calculator"
 module SolidusFriendlyPromotions
   module Calculators
     class FlatRate < Spree::Calculator
+      include PromotionCalculator
+
       preference :amount, :decimal, default: 0
       preference :currency, :string, default: -> { Spree::Config[:currency] }
 

data/app/models/solidus_friendly_promotions/calculators/flexi_rate.rb

@@ -5,6 +5,8 @@ require_dependency "spree/calculator"
 module SolidusFriendlyPromotions
   module Calculators
     class FlexiRate < Spree::Calculator
+      include PromotionCalculator
+
       preference :first_item, :decimal, default: 0
       preference :additional_item, :decimal, default: 0
       preference :max_items, :integer, default: 0

data/app/models/solidus_friendly_promotions/calculators/percent.rb

@@ -5,6 +5,8 @@ require_dependency "spree/calculator"
 module SolidusFriendlyPromotions
   module Calculators
     class Percent < Spree::Calculator
+      include PromotionCalculator
+
       preference :percent, :decimal, default: 0
 
       def compute(object)

data/app/models/solidus_friendly_promotions/calculators/tiered_flat_rate.rb

@@ -5,6 +5,8 @@ require_dependency "spree/calculator"
 module SolidusFriendlyPromotions
   module Calculators
     class TieredFlatRate < Spree::Calculator
+      include PromotionCalculator
+
       preference :base_amount, :decimal, default: 0
       preference :tiers, :hash, default: {}
       preference :currency, :string, default: -> { Spree::Config[:currency] }

data/app/models/solidus_friendly_promotions/calculators/tiered_percent.rb

@@ -5,6 +5,8 @@ require_dependency "spree/calculator"
 module SolidusFriendlyPromotions
   module Calculators
     class TieredPercent < Spree::Calculator
+      include PromotionCalculator
+
       preference :base_percent, :decimal, default: 0
       preference :tiers, :hash, default: {}
       preference :currency, :string, default: -> { Spree::Config[:currency] }

data/app/models/solidus_friendly_promotions/calculators/tiered_percent_on_eligible_item_quantity.rb

@@ -0,0 +1,36 @@
+require_dependency "spree/calculator"
+
+module SolidusFriendlyPromotions
+  module Calculators
+    class TieredPercentOnEligibleItemQuantity < SolidusFriendlyPromotions::Calculators::TieredPercent
+      before_validation do
+        # Convert tier values to decimals. Strings don't do us much good.
+        if preferred_tiers.is_a?(Hash)
+          self.preferred_tiers = preferred_tiers.map do |key, value|
+            [cast_to_d(key.to_i), cast_to_d(value.to_s)]
+          end.to_h
+        end
+      end
+
+      def compute_line_item(line_item)
+        order = line_item.order
+
+        _base, percent = preferred_tiers.sort.reverse.detect do |value, _|
+          eligible_line_items_quantity_total(order) >= value
+        end
+        if preferred_currency.casecmp(order.currency).zero?
+          currency_exponent = ::Money::Currency.find(preferred_currency).exponent
+          (line_item.discountable_amount * (percent || preferred_base_percent) / 100).round(currency_exponent)
+        else
+          0
+        end
+      end
+
+      private
+
+      def eligible_line_items_quantity_total(order)
+        calculable.promotion.applicable_line_items(order).sum(&:quantity)
+      end
+    end
+  end
+end

data/app/models/solidus_friendly_promotions/friendly_promotion_adjuster.rb

@@ -13,7 +13,8 @@ module SolidusFriendlyPromotions
     def call
       order.reset_current_discounts
 
-      return order if order.shipped?
+      return order if (!SolidusFriendlyPromotions.config.recalculate_complete_orders && order.complete?) || order.shipped?
+
       discounted_order = DiscountOrder.new(order, promotions, dry_run: dry_run).call
 
       PersistDiscountedOrder.new(discounted_order).call unless dry_run

data/app/models/solidus_friendly_promotions/promotion.rb

@@ -48,7 +48,7 @@ module SolidusFriendlyPromotions
     end
 
     self.allowed_ransackable_associations = ["codes"]
-    self.allowed_ransackable_attributes = %w[name path promotion_category_id]
+    self.allowed_ransackable_attributes = %w[name customer_label path promotion_category_id lane updated_at]
     self.allowed_ransackable_scopes = %i[active]
 
     # All orders that have been discounted using this promotion
@@ -155,6 +155,12 @@ module SolidusFriendlyPromotions
       end.all?
     end
 
+    def applicable_line_items(order)
+      order.discountable_line_items.select do |line_item|
+        eligible_by_applicable_rules?(line_item)
+      end
+    end
+
     private
 
     def apply_automatically_disallowed_with_paths

data/app/models/solidus_friendly_promotions/promotion_rule.rb

@@ -49,7 +49,7 @@ module SolidusFriendlyPromotions
     end
 
     def eligibility_error_message(key, options = {})
-      I18n.t(key, **{scope: [:solidus_friendly_promotions, :eligibility_errors, self.class.name.underscore]}.merge(options))
+      I18n.t(key, scope: [:solidus_friendly_promotions, :eligibility_errors, self.class.name.underscore], **options)
     end
   end
 end

data/app/models/solidus_friendly_promotions/rules/minimum_quantity.rb

@@ -27,13 +27,7 @@ module SolidusFriendlyPromotions
       # @param order [Spree::Order] the order we want to check eligibility on
       # @return [Boolean] true if promotion is eligible, false otherwise
       def eligible?(order)
-        applicable_line_items = order.line_items.select do |line_item|
-          promotion.rules.select do |rule|
-            rule.applicable?(line_item)
-          end.all? { _1.eligible?(line_item) }
-        end
-
-        if applicable_line_items.sum(&:quantity) < preferred_minimum_quantity
+        if promotion.applicable_line_items(order).sum(&:quantity) < preferred_minimum_quantity
           eligibility_errors.add(
             :base,
             eligibility_error_message(:quantity_less_than_minimum, count: preferred_minimum_quantity),

data/app/views/solidus_friendly_promotions/admin/promotion_actions/_promotion_action.html.erb

@@ -21,7 +21,7 @@
       <%= render 'solidus_friendly_promotions/admin/promotion_actions/form', form: form %>
       <div class="row">
         <div class="col-12">
-          <%= button_tag "Update", class: "btn btn-secondary float-right" %>
+          <%= button_tag t(:update, scope: [:solidus_friendly_promotions, :crud]), class: "btn btn-secondary float-right" %>
         </div>
       </div>
     <% end %>

data/app/views/solidus_friendly_promotions/admin/promotion_actions/actions/_calculator_fields.erb

@@ -1,6 +1,7 @@
 
 <% calculator = promotion_action.calculator %>
 <% type_name = calculator.type.demodulize.underscore %>
+<%= calculator.description %>
 <% if lookup_context.exists?("fields",  ["solidus_friendly_promotions/admin/promotion_actions/calculators/#{type_name}"], true) %>
   <%= render "solidus_friendly_promotions/admin/promotion_actions/calculators/#{type_name}/fields", calculator: calculator, prefix: param_prefix, form: form %>
 <% else %>

data/app/views/solidus_friendly_promotions/admin/promotion_actions/actions/_create_discounted_item.html.erb

@@ -5,6 +5,10 @@
     <%= form.label :preferred_quantity %>
     <%= form.number_field :preferred_quantity, class: "fullwidth" %>
   </div>
+  <div class="field">
+    <%= form.label :preferred_necessary_quantity %>
+    <%= form.number_field :preferred_necessary_quantity, class: "fullwidth" %>
+  </div>
 <% end %>
 
 <%= render(