Merge branch 'main' into add_brand_to_product_from_config

solidusio · Dec 3, 2024 · a7a5b0c · a7a5b0c
2 parents 2a64a9b + ad84609
commit a7a5b0c
Show file tree

Hide file tree

Showing 12 changed files with 6 additions and 1 deletion.
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
@@ -2099,6 +2099,7 @@ en:
     scope: Scope
     search: Search
     search_results: Search results for '%{keywords}'
+    search_results_all: Show all results for '%{keywords}'
     searching: Searching
     secure_connection_type: Secure Connection Type
     security_settings: Security Settings

diff --git a/...admin_adjustments_controller_decorator.rb → ...admin_adjustments_controller_decorator.rb b/...admin_adjustments_controller_decorator.rb → ...admin_adjustments_controller_decorator.rb
diff --git a/...ib/spree_order_state_machine_decorator.rb → ...ns/spree_order_state_machine_decorator.rb b/...ib/spree_order_state_machine_decorator.rb → ...ns/spree_order_state_machine_decorator.rb
diff --git a/...ions/models/spree_adjustment_decorator.rb → ..._promotions/spree_adjustment_decorator.rb b/...ions/models/spree_adjustment_decorator.rb → ..._promotions/spree_adjustment_decorator.rb
diff --git a/...eturns_default_refund_amount_decorator.rb → ...eturns_default_refund_amount_decorator.rb b/...eturns_default_refund_amount_decorator.rb → ...eturns_default_refund_amount_decorator.rb
diff --git a/...tions/models/spree_line_item_decorator.rb → ...y_promotions/spree_line_item_decorator.rb b/...tions/models/spree_line_item_decorator.rb → ...y_promotions/spree_line_item_decorator.rb
diff --git a/...romotions/models/spree_order_decorator.rb → ...egacy_promotions/spree_order_decorator.rb b/...romotions/models/spree_order_decorator.rb → ...egacy_promotions/spree_order_decorator.rb
diff --git a/...s/models/spree_order_updater_decorator.rb → ...omotions/spree_order_updater_decorator.rb b/...s/models/spree_order_updater_decorator.rb → ...omotions/spree_order_updater_decorator.rb
diff --git a/...motions/models/spree_product_decorator.rb → ...acy_promotions/spree_product_decorator.rb b/...motions/models/spree_product_decorator.rb → ...acy_promotions/spree_product_decorator.rb
diff --git a/...otions/models/spree_shipment_decorator.rb → ...cy_promotions/spree_shipment_decorator.rb b/...otions/models/spree_shipment_decorator.rb → ...cy_promotions/spree_shipment_decorator.rb
diff --git a/promotions/app/models/solidus_promotions/promotion.rb b/promotions/app/models/solidus_promotions/promotion.rb
@@ -9,7 +9,7 @@ class Promotion < Spree::Base
     belongs_to :original_promotion, class_name: "Spree::Promotion", optional: true
     has_many :benefits, class_name: "SolidusPromotions::Benefit", dependent: :destroy
     has_many :conditions, through: :benefits
-    has_many :codes, class_name: "SolidusPromotions::PromotionCode", dependent: :destroy
+    has_many :codes, class_name: "SolidusPromotions::PromotionCode", dependent: :destroy, inverse_of: :promotion
     has_many :code_batches, class_name: "SolidusPromotions::PromotionCodeBatch", dependent: :destroy
     has_many :order_promotions, class_name: "SolidusPromotions::OrderPromotion", dependent: :destroy
 

diff --git a/promotions/lib/controllers/backend/solidus_promotions/admin/promotion_codes_controller.rb b/promotions/lib/controllers/backend/solidus_promotions/admin/promotion_codes_controller.rb
@@ -48,6 +48,10 @@ def create
 
       private
 
+      def model_class
+        SolidusPromotions::PromotionCode
+      end
+
       def load_promotion
         @promotion = SolidusPromotions::Promotion
           .accessible_by(current_ability, :show)