Skip to content

recalc modifier prices inside the lock so theyre fresh, also include … #774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
subhansh-dev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

recalc modifier prices inside the lock so theyre fresh, also include … #774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/controllers/shop/orders_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ def create
current_user.lock!
@shop_item.lock! if @shop_item.limited?

# recalc mod prices after lock so theyre fresh
modifiers_total = @modifiers.sum { |m| m.price_for_region(region) }
total_cost = item_total + accessories_total + modifiers_total

if @mission_submission.nil?
user_balance = current_user.balance
if total_cost > user_balance
Expand Down
4 changes: 3 additions & 1 deletion app/models/shop_order.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,9 @@ def check_user_balance
return if redeeming_mission_submission.present?
return unless frozen_item_price&.positive? && quantity.present?

total_cost_for_validation = frozen_item_price * quantity
# include modifier costs in the balance check
modifier_cost = frozen_modifiers_price || 0
total_cost_for_validation = (frozen_item_price * quantity) + modifier_cost
if user&.balance&.< total_cost_for_validation
shortage = total_cost_for_validation - (user.balance || 0)
errors.add(:base, "Insufficient balance. You need #{shortage} more tickets.")
Expand Down