Skip to content

Commit

Permalink
Merge pull request #5943 from mamhoff/fix-admin-promotions-controller
Browse files Browse the repository at this point in the history
Fix admin promotions controller
tvdeyen authored Nov 19, 2024

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents acea185 + 2eccd6d commit e3b326a
Showing 5 changed files with 21 additions and 4 deletions.
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ def search_url
end

def row_url(promotion)
solidus_promotions.admin_promotion_path(promotion)
solidus_promotions.edit_admin_promotion_path(promotion)
end

def page_actions
@@ -63,14 +63,16 @@ def columns
{
header: :name,
data: ->(promotion) do
content_tag :div, promotion.name
link_to promotion.name, row_url(promotion)
end
},
{
header: :code,
data: ->(promotion) do
count = promotion.codes.count
(count == 1) ? promotion.codes.pick(:value) : t("spree.number_of_codes", count: count)
link_to solidus_promotions.admin_promotion_promotion_codes_path(promotion), title: t(".codes") do
count = promotion.codes.count
(count == 1) ? promotion.codes.pick(:value) : t("spree.number_of_codes", count: count)
end
end
},
{
Original file line number Diff line number Diff line change
@@ -8,3 +8,4 @@ en:
status:
active: Active
inactive: Inactive
codes: Codes
Original file line number Diff line number Diff line change
@@ -25,5 +25,11 @@ def destroy
flash[:notice] = t(".success")
redirect_back_or_to solidus_promotions.promotion_categories_path, status: :see_other
end

private

def authorization_subject
SolidusPromotions::PromotionCategory
end
end
end
Original file line number Diff line number Diff line change
@@ -42,5 +42,9 @@ def load_promotion
def promotion_params
params.require(:promotion).permit(:user_id, permitted_promotion_attributes)
end

def authorization_subject
SolidusPromotions::Promotion
end
end
end
Original file line number Diff line number Diff line change
@@ -32,5 +32,9 @@
expect(page).to have_content("Promotions were successfully removed.")
expect(page).not_to have_content("My active Promotion")
expect(SolidusPromotions::Promotion.count).to eq(3)

click_link("My future Promotion")
expect(page).to have_content("My future Promotion")
expect(page).to have_content("Starts at")
end
end

0 comments on commit e3b326a

Please sign in to comment.