solidus_friendly_promotions 1.0.0.rc.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84ea9571f3d2a4a2dfe9e789c0f3887a0aca2d9559a68004806cd67c395fc959
-  data.tar.gz: 929a14c4f917aad08c6bf7faa7f93c7be071dc43ad72641ddf0394cf336022db
+  metadata.gz: 5cc3437f15c2341c8a233e48b1443996b09e923cf84727fb834baa766dd1bee7
+  data.tar.gz: 9c534dc4a7ce6f3a09bb6c14d046ea8d6c9e313dbea3c5f1e6767000d8eb0cca
 SHA512:
-  metadata.gz: 9e49887ad42376b60165ab1d5a8067942adde8d9861681e165b0617155eb74f42a5ea97f2bd94ce929ee5627156ab249ab392b5259e775ecdb53414444bb94be
-  data.tar.gz: cc68b4daf7520de18dbe22bd0b74a73e1a4b009d031d8703b86f7e6d5ad11cfd5999159b48cdb0bfc7801235fe8587bc5c7cfe56a76fb18eee3fef7b48c903a4
+  metadata.gz: c345c4dbd052db90957b5a2c886c39c7a328452b616822ce326b2b4170d6b2232be827dc43f7374a33e116fc50b2f9229c5d0b34c46ca3d2a09e26a486319143
+  data.tar.gz: 9a2ef29fa7045ae95d884903fe80beadacfc6e89f5fa096f61c5c53709f836f3cf76b6483e11fc488d9140ad1720dee41cdd7cb78f22c1649b1bb107540ef609

data/CHANGELOG.md

@@ -1 +1,155 @@
 # Changelog
+
+## [v1.0.0](https://github.com/friendlycart/solidus_friendly_promotions/tree/v1.0.0) (2024-01-25)
+
+[Full Changelog](https://github.com/friendlycart/solidus_friendly_promotions/compare/v1.0.0.rc.3...v1.0.0)
+
+**Implemented enhancements:**
+
+- Implement better soft-delete [\#30](https://github.com/friendlycart/solidus_friendly_promotions/issues/30)
+
+**Closed issues:**
+
+- Cannot delete promotion with promotion code [\#94](https://github.com/friendlycart/solidus_friendly_promotions/issues/94)
+- Missing action for button: Promotion code batch [\#93](https://github.com/friendlycart/solidus_friendly_promotions/issues/93)
+
+**Merged pull requests:**
+
+- Improve soft-deletion faculty [\#102](https://github.com/friendlycart/solidus_friendly_promotions/pull/102) ([mamhoff](https://github.com/mamhoff))
+- Add missing association between promo codes and order promotions [\#101](https://github.com/friendlycart/solidus_friendly_promotions/pull/101) ([mamhoff](https://github.com/mamhoff))
+- Revert "Temporarily disable running specs for Solidus main" [\#100](https://github.com/friendlycart/solidus_friendly_promotions/pull/100) ([mamhoff](https://github.com/mamhoff))
+- Add admin UI for promotion code batches [\#99](https://github.com/friendlycart/solidus_friendly_promotions/pull/99) ([mamhoff](https://github.com/mamhoff))
+- Define SolidusFriendlyPromotions.table\_name\_prefix early [\#98](https://github.com/friendlycart/solidus_friendly_promotions/pull/98) ([mamhoff](https://github.com/mamhoff))
+
+## [v1.0.0.rc.3](https://github.com/friendlycart/solidus_friendly_promotions/tree/v1.0.0.rc.3) (2024-01-16)
+
+[Full Changelog](https://github.com/friendlycart/solidus_friendly_promotions/compare/v1.0.0.rc.2...v1.0.0.rc.3)
+
+**Closed issues:**
+
+- Provide Integration Instructions for Starter Frontend [\#90](https://github.com/friendlycart/solidus_friendly_promotions/issues/90)
+
+**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)
+
+**Implemented enhancements:**
+
+- Implement  Free items [\#31](https://github.com/friendlycart/solidus_friendly_promotions/issues/31)
+
+**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)
+
+**Implemented enhancements:**
+
+- Migrator: Copy promotion codes [\#34](https://github.com/friendlycart/solidus_friendly_promotions/issues/34)
+- Add original\_promotion\_{action\_}id on promotions and promotion actions [\#33](https://github.com/friendlycart/solidus_friendly_promotions/issues/33)
+
+**Fixed bugs:**
+
+- Migrator: Add support for promotion categories [\#37](https://github.com/friendlycart/solidus_friendly_promotions/issues/37)
+
+**Closed issues:**
+
+- Document DB tables [\#35](https://github.com/friendlycart/solidus_friendly_promotions/issues/35)
+
+**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.

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
@@ -49,6 +49,10 @@ module SolidusFriendlyPromotions
       def routes_proxy
         solidus_friendly_promotions
       end
+
+      def parent_model_name
+        self.class.parent_data[:model_name].gsub("solidus_friendly_promotions/", "")
+      end
     end
   end
 end

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

@@ -53,7 +53,7 @@ module SolidusFriendlyPromotions
 
       def destroy
         @promotion_action = @promotion.actions.find(params[:id])
-        if @promotion_action.discard
+        if @promotion_action.destroy
           flash[:success] =
             t("spree.successfully_removed", resource: SolidusFriendlyPromotions::PromotionAction.model_name.human)
         end

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

@@ -25,6 +25,18 @@ module SolidusFriendlyPromotions
       def build_promotion_code_batch
         @promotion_code_batch.process
       end
+
+      def model_class
+        SolidusFriendlyPromotions::PromotionCodeBatch
+      end
+
+      def collection
+        parent.code_batches
+      end
+
+      def build_resource
+        parent.code_batches.build
+      end
     end
   end
 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/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/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/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

@@ -2,11 +2,13 @@
 
 module SolidusFriendlyPromotions
   class Promotion < Spree::Base
+    include Spree::SoftDeletable
+
     belongs_to :category, class_name: "SolidusFriendlyPromotions::PromotionCategory",
       foreign_key: :promotion_category_id, optional: true
     belongs_to :original_promotion, class_name: "Spree::Promotion", optional: true
     has_many :rules, class_name: "SolidusFriendlyPromotions::PromotionRule", dependent: :destroy
-    has_many :actions, class_name: "SolidusFriendlyPromotions::PromotionAction", dependent: :nullify
+    has_many :actions, class_name: "SolidusFriendlyPromotions::PromotionAction", dependent: :destroy
     has_many :codes, class_name: "SolidusFriendlyPromotions::PromotionCode", dependent: :destroy
     has_many :code_batches, class_name: "SolidusFriendlyPromotions::PromotionCodeBatch", dependent: :destroy
     has_many :order_promotions, class_name: "SolidusFriendlyPromotions::OrderPromotion", dependent: :destroy
@@ -49,7 +51,7 @@ module SolidusFriendlyPromotions
 
     self.allowed_ransackable_associations = ["codes"]
     self.allowed_ransackable_attributes = %w[name customer_label path promotion_category_id lane updated_at]
-    self.allowed_ransackable_scopes = %i[active]
+    self.allowed_ransackable_scopes = %i[active with_discarded]
 
     # All orders that have been discounted using this promotion
     def discounted_orders

data/app/models/solidus_friendly_promotions/promotion_action.rb

@@ -9,9 +9,10 @@ module SolidusFriendlyPromotions
   # by an event and determined to be eligible.
   class PromotionAction < Spree::Base
     include Spree::Preferences::Persistable
-    include Spree::SoftDeletable
     include Spree::CalculatedAdjustments
     include Spree::AdjustmentSource
+    before_destroy :remove_adjustments_from_incomplete_orders
+    before_destroy :raise_for_adjustments_for_completed_orders
 
     belongs_to :promotion, inverse_of: :actions
     belongs_to :original_promotion_action, class_name: "Spree::PromotionAction", optional: true
@@ -69,5 +70,14 @@ module SolidusFriendlyPromotions
     def available_calculators
       SolidusFriendlyPromotions.config.promotion_calculators[self.class] || (raise NotImplementedError)
     end
+
+    private
+
+    def raise_for_adjustments_for_completed_orders
+      if adjustments.joins(:order).merge(Spree::Order.complete).any?
+        errors.add(:base, :cannot_destroy_if_order_completed)
+        throw(:abort)
+      end
+    end
   end
 end

data/app/models/solidus_friendly_promotions/promotion_code.rb

@@ -4,6 +4,8 @@ module SolidusFriendlyPromotions
   class PromotionCode < Spree::Base
     belongs_to :promotion, inverse_of: :codes
     belongs_to :promotion_code_batch, inverse_of: :promotion_codes, optional: true
+
+    has_many :order_promotions, class_name: "SolidusFriendlyPromotions::OrderPromotion", dependent: :destroy
     has_many :adjustments, class_name: "Spree::Adjustment"
 
     before_validation :normalize_code

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/calculators/distributed_amount/_fields.html.erb

@@ -9,45 +9,7 @@
   <p>
     <%= admin_hint(
       calculator.model_name.human,
-      """
-        <p>
-          This amount will be distributed to line items weighted relative to
-          their price. More expensive line items will receive a greater share
-          of the adjustment.
-        </p>
-
-        <p>
-          For example, with three line items and a preferred amount of $15 we
-          would end up with the following distribution:
-        </p>
-
-        <table>
-          <thead>
-            <tr>
-              <th></th>
-              <th>Price</th>
-              <th>Weighted Adj.</th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td>Socks</td>
-              <td>$5</td>
-              <td>-$1.5</td>
-            </tr>
-            <tr>
-              <td>Shoes</td>
-              <td>$30</td>
-              <td>-$9</td>
-            </tr>
-            <tr>
-              <td>Slippers</td>
-              <td>$15</td>
-              <td>-$4.5</td>
-            </tr>
-          </tbody>
-        </table>
-      """
+      calculator.class.human_attribute_name(:explanation)
     ) %>
 
     This amount will be the <strong>total</strong> discount spread amongst all

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

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

data/app/views/solidus_friendly_promotions/admin/promotion_code_batches/_form_fields.html.erb

@@ -0,0 +1,22 @@
+<div class="field">
+  <%= batch.label :base_code, class: "required" %>
+  <%= batch.text_field :base_code, class: "fullwidth", required: true %>
+</div>
+<div class="field">
+  <%= batch.label :number_of_codes, class: "required" %>
+  <%= batch.number_field :number_of_codes, class: "fullwidth", min: 1, required: true %>
+</div>
+<div class="field">
+  <%= batch.label :join_characters %>
+  <%= batch.text_field :join_characters, class: "fullwidth" %>
+</div>
+<% unless promotion_id %>
+  <div class="field">
+    <%= f.label :per_code_usage_limit %>
+    <%= f.text_field :per_code_usage_limit, class: "fullwidth" %>
+  </div>
+<% end %>
+<div class="field">
+  <%= batch.label :email %>
+  <%= batch.text_field :email, class: "fullwidth" %>
+</div>

data/app/views/solidus_friendly_promotions/admin/promotion_code_batches/download.csv.ruby

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+CSV.generate do |csv|
+  csv << ["Code"]
+  @promotion_code_batch.promotion_codes.order(:id).pluck(:value).each do |value|
+    csv << [value]
+  end
+end

data/app/views/solidus_friendly_promotions/admin/promotion_code_batches/index.html.erb

@@ -0,0 +1,65 @@
+<% admin_breadcrumb(link_to plural_resource_name(SolidusFriendlyPromotions::Promotion), solidus_friendly_promotions.admin_promotions_path) %>
+<% admin_breadcrumb(link_to @promotion.name, solidus_friendly_promotions.edit_admin_promotion_path(@promotion.id)) %>
+<% admin_breadcrumb(plural_resource_name(SolidusFriendlyPromotions::PromotionCodeBatch)) %>
+
+<% content_for :page_actions do %>
+  <li>
+    <% if can?(:create, SolidusFriendlyPromotions::PromotionCodeBatch) %>
+      <%= link_to t('solidus_friendly_promotions.new_promotion_code_batch'), new_object_url, class: 'btn btn-primary' %>
+    <% end %>
+  </li>
+<% end %>
+
+<% if @promotion_code_batches.any? %>
+  <table>
+    <thead>
+      <tr>
+        <th><%= SolidusFriendlyPromotions::PromotionCodeBatch.human_attribute_name(:base_code) %></th>
+        <th><%= SolidusFriendlyPromotions::PromotionCodeBatch.human_attribute_name(:total_codes) %></th>
+        <th><%= SolidusFriendlyPromotions::PromotionCodeBatch.human_attribute_name(:status) %></th>
+        <th><%= SolidusFriendlyPromotions::PromotionCodeBatch.human_attribute_name(:email) %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @promotion_code_batches.each do |promotion_code_batch| %>
+        <tr>
+          <td><%= promotion_code_batch.base_code %></td>
+          <td><%= promotion_code_batch.number_of_codes %></td>
+          <td>
+            <% if promotion_code_batch.error.present? %>
+              <%= t(
+                "solidus_friendly_promotions.promotion_code_batches.errored",
+                error: promotion_code_batch.error
+              ) %>
+            <% elsif promotion_code_batch.finished? %>
+              <%= t(
+                "solidus_friendly_promotions.promotion_code_batches.finished",
+                number_of_codes: promotion_code_batch.number_of_codes
+              ) %>
+              <%= link_to(
+                t('solidus_friendly_promotions.download_promotion_codes_list'),
+                admin_promotion_promotion_code_batch_download_path(
+                  promotion_code_batch_id: promotion_code_batch.id,
+                  format: :csv
+                )
+              ) %>
+            <% else %>
+              <%= t(
+                "solidus_friendly_promotions.promotion_code_batches.processing",
+                number_of_codes: promotion_code_batch.number_of_codes,
+                number_of_codes_processed: promotion_code_batch.promotion_codes.count
+              ) %>
+            <% end %>
+          </td>
+          <td><%= promotion_code_batch.email %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% else %>
+  <div class="no-objects-found">
+    <%= render 'spree/admin/shared/no_objects_found',
+                 resource: SolidusFriendlyPromotions::PromotionCodeBatch,
+                 new_resource_url: new_object_url %>
+  </div>
+<% end %>

data/app/views/solidus_friendly_promotions/admin/promotion_code_batches/new.html.erb

@@ -0,0 +1,8 @@
+<% admin_breadcrumb(link_to plural_resource_name(Spree::Promotion), spree.admin_promotions_path) %>
+<% admin_breadcrumb(link_to @promotion.name, spree.admin_promotion_path(@promotion.id)) %>
+<% admin_breadcrumb(plural_resource_name(Spree::PromotionCodeBatch)) %>
+<%= form_for :promotion_code_batch, url: collection_url do |batch| %>
+  <%= batch.hidden_field :promotion_id, value: params[:promotion_id] %>
+  <%= render partial: 'form_fields', locals: {batch: batch, promotion_id: params[:promotion_id]} %>
+  <%= batch.submit t('spree.actions.create'), class: 'btn btn-primary' %>
+<% end %>

data/app/views/solidus_friendly_promotions/admin/promotions/_table.html.erb

@@ -14,7 +14,7 @@
   </thead>
   <tbody>
     <% promotions.each do |promotion| %>
-      <tr id="<%= spree_dom_id promotion %>">
+      <tr class="<%= 'deleted' if promotion.discarded? %>" id="<%= spree_dom_id promotion %>">
         <td><%= promotion.name %></td>
         <td>
           <%= (promotion.codes.size == 1) ? promotion.codes.pluck(:value).first : t('solidus_friendly_promotions.number_of_codes', count: promotion.codes.size) %>
@@ -43,10 +43,10 @@
           <%= l(promotion.updated_at, format: :short) %>
         </td>
         <td class="actions">
-          <% if can?(:edit, promotion) %>
+          <% if can?(:edit, promotion) && !promotion.discarded? %>
             <%= link_to_edit promotion, no_text: true %>
           <% end %>
-          <% if can?(:destroy, promotion) %>
+          <% if can?(:destroy, promotion) && !promotion.discarded? %>
             <%= link_to_delete promotion, no_text: true %>
           <% end %>
         </td>

data/app/views/solidus_friendly_promotions/admin/promotions/_table_filter.html.erb

@@ -43,6 +43,15 @@
           </div>
         </div>
 
+        <div class="col-2">
+          <div class="field checkbox">
+            <label>
+              <%= f.check_box :with_discarded, { checked: params[:q][:with_discarded] == 'true', class: 'js-with-discarded-input' }, 'true', 'false' %>
+              <%= t('spree.show_deleted') %>
+            </label>
+          </div>
+        </div>
+
         <div class="col-2">
           <div class="field">
             <%= label_tag :q_promotion_category_id_eq, SolidusFriendlyPromotions::PromotionCategory.model_name.human %><br>

data/app/views/solidus_friendly_promotions/admin/shared/_promotion_sub_menu.html.erb

@@ -5,10 +5,10 @@
   <% if can? :admin, SolidusFriendlyPromotions::PromotionCategory %>
     <%= tab url: solidus_friendly_promotions.admin_promotion_categories_path, label: :promotion_categories %>
   <% end %>
-  <% if can? :admin, Spree::Promotion && Spree::Promotion.any? %>
+  <% if can?(:admin, Spree::Promotion) && Spree::Promotion.any? %>
     <%= tab url: spree.admin_promotions_path, label: :legacy_promotions %>
   <% end %>
-  <% if can? :admin, Spree::PromotionCategory && Spree::PromotionCategory.any? %>
+  <% if can?(:admin, Spree::PromotionCategory) && Spree::PromotionCategory.any? %>
     <%= tab url: spree.admin_promotion_categories_path, label: :legacy_promotion_categories %>
   <% end %>
 </ul>

data/bin/sandbox

@@ -65,6 +65,7 @@ unbundled bundle exec rake db:drop db:create
 
 unbundled bin/rails generate solidus:install \
   --auto-accept \
+  --admin_preview=false \
   $@
 
 unbundled bundle exec rails generate solidus:auth:install --auto-run-migrations

data/config/locales/en.yml

@@ -39,6 +39,9 @@ en:
     no_rules_added: No Rules Added
     promotion_successfully_created: Promotion has been successfully created!
     promotion_total_changed_before_complete: One or more of the promotions on your order have become ineligible and were removed. Please check the new order amounts and try again.
+    promotion_code_batches:
+      finished: Finished
+      errored: Errored
     view_promotion_codes_list: View codes list
     promotion_rules:
       line_item_product:
@@ -190,6 +193,9 @@ en:
       solidus_friendly_promotions/rules/user: User
       solidus_friendly_promotions/rules/user_logged_in: User Logged In
       solidus_friendly_promotions/rules/user_role: User Role(s)
+      solidus_friendly_promotions/promotion_code_batch:
+        one: Code batch
+        other: Code batches
     attributes:
       solidus_friendly_promotions/promotion:
         active: Active
@@ -269,9 +275,49 @@ en:
         description: Provides a discount calculated by percent of the discountable amount of the item being discounted
       solidus_friendly_promotions/calculators/distributed_amount:
         description: Distributed the configured amount among all eligible line items of the order
+        explanation: |
+          <p>
+            This amount will be distributed to line items weighted relative to
+            their price. More expensive line items will receive a greater share
+            of the adjustment.
+          </p>
+          <p>
+            For example, with three line items and a preferred amount of $15 we
+            would end up with the following distribution:
+          </p>
+          <table>
+            <thead>
+              <tr>
+                <th></th>
+                <th>Price</th>
+                <th>Weighted Adj.</th>
+              </tr>
+            </thead>
+            <tbody>
+              <tr>
+                <td>Socks</td>
+                <td>$5</td>
+                <td>-$1.5</td>
+              </tr>
+              <tr>
+                <td>Shoes</td>
+                <td>$30</td>
+                <td>-$9</td>
+              </tr>
+              <tr>
+                <td>Slippers</td>
+                <td>$15</td>
+                <td>-$4.5</td>
+              </tr>
+            </tbody>
+          </table>
 
     errors:
       models:
+        solidus_friendly_promotions/promotion_action:
+          attributes:
+            base:
+              cannot_destroy_if_order_completed: Action has been applied to complete orders. It cannot be destroyed.
         solidus_friendly_promotions/promotion_code:
           attributes:
             base:

data/db/migrate/20240124104855_add_deleted_at_to_promotions.rb

@@ -0,0 +1,6 @@
+class AddDeletedAtToPromotions < ActiveRecord::Migration[7.0]
+  def change
+    add_column :friendly_promotions, :deleted_at, :datetime
+    add_index :friendly_promotions, :deleted_at
+  end
+end

data/db/migrate/20240125102050_drop_deleted_at_from_promotion_actions.rb

@@ -0,0 +1,5 @@
+class DropDeletedAtFromPromotionActions < ActiveRecord::Migration[7.0]
+  def change
+    remove_column :friendly_promotion_actions, :deleted_at, :datetime, null: true
+  end
+end

data/lib/solidus_friendly_promotions/configuration.rb

@@ -5,10 +5,12 @@ require "spree/core/environment_extension"
 module SolidusFriendlyPromotions
   class Configuration < Spree::Preferences::Configuration
     attr_accessor :sync_order_promotions
+    attr_accessor :recalculate_complete_orders
     attr_accessor :promotion_calculators
 
     def initialize
       @sync_order_promotions = true
+      @recalculate_complete_orders = true
       @promotion_calculators = NestedClassSet.new
     end
 

data/lib/solidus_friendly_promotions/promotion_migrator.rb

@@ -94,7 +94,7 @@ module SolidusFriendlyPromotions
       else
         new_rule = new_promo_rule_class.new(old_promotion_rule.attributes.except(*PROMOTION_IGNORED_ATTRIBUTES))
         new_rule.preload_relations.each do |relation|
-          new_rule.send("#{relation}=", old_promotion_rule.send(relation))
+          new_rule.send(:"#{relation}=", old_promotion_rule.send(relation))
         end
         [new_rule]
       end

data/lib/solidus_friendly_promotions/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusFriendlyPromotions
-  VERSION = "1.0.0.rc.2"
+  VERSION = "1.0.0"
 end

data/lib/solidus_friendly_promotions.rb

@@ -7,13 +7,18 @@ require "turbo-rails"
 require "importmap-rails"
 require "stimulus-rails"
 require "ransack-enum"
-require "solidus_friendly_promotions/nested_class_set"
-require "solidus_friendly_promotions/configuration"
-require "solidus_friendly_promotions/version"
-require "solidus_friendly_promotions/engine"
 
 module SolidusFriendlyPromotions
+  def self.table_name_prefix
+    "friendly_"
+  end
+
   # JS Importmap instance
   singleton_class.attr_accessor :importmap
   self.importmap = Importmap::Map.new
 end
+
+require "solidus_friendly_promotions/nested_class_set"
+require "solidus_friendly_promotions/configuration"
+require "solidus_friendly_promotions/version"
+require "solidus_friendly_promotions/engine"

data/solidus_friendly_promotions.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
   spec.license = "BSD-3-Clause"
 
   spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/solidusio-contrib/solidus_friendly_promotions"
-  spec.metadata["changelog_uri"] = "https://github.com/solidusio-contrib/solidus_friendly_promotions/blob/master/CHANGELOG.md"
+  spec.metadata["source_code_uri"] = "https://github.com/friendlycart/solidus_friendly_promotions"
+  spec.metadata["changelog_uri"] = "https://github.com/friendlycart/solidus_friendly_promotions/blob/master/CHANGELOG.md"
 
   spec.required_ruby_version = Gem::Requirement.new(">= 2.5", "< 4")
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_friendly_promotions
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-11-11 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -209,7 +209,6 @@ files:
 - app/models/concerns/solidus_friendly_promotions/rules/line_item_level_rule.rb
 - app/models/concerns/solidus_friendly_promotions/rules/order_level_rule.rb
 - app/models/concerns/solidus_friendly_promotions/rules/shipment_level_rule.rb
-- app/models/solidus_friendly_promotions.rb
 - app/models/solidus_friendly_promotions/actions/adjust_line_item.rb
 - app/models/solidus_friendly_promotions/actions/adjust_line_item_quantity_groups.rb
 - app/models/solidus_friendly_promotions/actions/adjust_shipment.rb
@@ -291,6 +290,10 @@ files:
 - app/views/solidus_friendly_promotions/admin/promotion_categories/edit.html.erb
 - app/views/solidus_friendly_promotions/admin/promotion_categories/index.html.erb
 - app/views/solidus_friendly_promotions/admin/promotion_categories/new.html.erb
+- app/views/solidus_friendly_promotions/admin/promotion_code_batches/_form_fields.html.erb
+- app/views/solidus_friendly_promotions/admin/promotion_code_batches/download.csv.ruby
+- app/views/solidus_friendly_promotions/admin/promotion_code_batches/index.html.erb
+- app/views/solidus_friendly_promotions/admin/promotion_code_batches/new.html.erb
 - app/views/solidus_friendly_promotions/admin/promotion_codes/index.csv.ruby
 - app/views/solidus_friendly_promotions/admin/promotion_codes/index.html.erb
 - app/views/solidus_friendly_promotions/admin/promotion_codes/new.html.erb
@@ -335,7 +338,6 @@ files:
 - bin/sandbox
 - bin/setup
 - config/importmap.rb
-- config/initializers/solidus_friendly_promotions.rb
 - config/locales/en.yml
 - config/routes.rb
 - db/migrate/20230703101637_create_promotions.rb
@@ -363,6 +365,8 @@ files:
 - db/migrate/20231012120928_add_db_comments_to_friendly_promotion_categories.rb
 - db/migrate/20231013181921_add_original_promotion_ids.rb
 - db/migrate/20231104135812_add_managed_by_order_action_to_line_items.rb
+- db/migrate/20240124104855_add_deleted_at_to_promotions.rb
+- db/migrate/20240125102050_drop_deleted_at_from_promotion_actions.rb
 - lib/generators/solidus_friendly_promotions/install/install_generator.rb
 - lib/generators/solidus_friendly_promotions/install/templates/initializer.rb
 - lib/solidus_friendly_promotions.rb
@@ -390,8 +394,8 @@ licenses:
 - BSD-3-Clause
 metadata:
   homepage_uri: https://github.com/solidusio-contrib/solidus_friendly_promotions#readme
-  source_code_uri: https://github.com/solidusio-contrib/solidus_friendly_promotions
-  changelog_uri: https://github.com/solidusio-contrib/solidus_friendly_promotions/blob/master/CHANGELOG.md
+  source_code_uri: https://github.com/friendlycart/solidus_friendly_promotions
+  changelog_uri: https://github.com/friendlycart/solidus_friendly_promotions/blob/master/CHANGELOG.md
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -406,9 +410,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.4.20
 signing_key:

data/app/models/solidus_friendly_promotions.rb

@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module SolidusFriendlyPromotions
-  def self.table_name_prefix
-    "friendly_"
-  end
-end

data/config/initializers/solidus_friendly_promotions.rb

@@ -1,3 +0,0 @@
-# frozen_string_literal: true
-
-require_relative SolidusFriendlyPromotions::Engine.root.join("app/models/solidus_friendly_promotions.rb")