Skip to content
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.

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

複数冊の予約取り置きの割り当てを修正 #1940

Merged
merged 4 commits into from
Jan 19, 2025
Merged
Changes from 1 commit
Commits
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
Next Next commit
fix checkout
nabeta committed Jan 19, 2025
commit 9ce2a59541ae4c2aed8b0bf201aa54a3d25ecf59
9 changes: 4 additions & 5 deletions app/models/concerns/enju_circulation/enju_item.rb
Original file line number Diff line number Diff line change
@@ -94,11 +94,10 @@ def available_for_checkout?

def checkout!(user)
Item.transaction do
if user_reservation(user)
unless user_reservation.state_machine.in_state?(:completed)
user_reservation.checked_out_at = Time.zone.now
user_reservation.state_machine.transition_to!(:completed)
end
reserve = user_reservation(user)
if reserve && reserve.state_machine.not_in_state?(:completed)
reserve.checked_out_at = Time.zone.now
reserve.state_machine.transition_to!(:completed)
end

update!(circulation_status: CirculationStatus.find_by(name: 'On Loan'))