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.

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

Jump to bottom

Cancel requested assets without checkin/out [ch-17606] #13219

Merged
merged 8 commits into from
Jun 29, 2023
Merged

Cancel requested assets without checkin/out [ch-17606] #13219

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
62347a5
Add button with cancel action in requested assets view
inietov Jun 27, 2023
b647a8f
Change the inline form HTML label to the Form:: facade
inietov Jun 27, 2023
eb4d764
Refactor Requestable@cancelRequest() firm to admit a user_id so we ca…
inietov Jun 27, 2023
1c29bd3
Added feature to cancel requests from the Requested Assets view
inietov Jun 28, 2023
b4b84f9
Redirect to correct page after cancel action
inietov Jun 28, 2023
8496e64
Adds ternary to set a quantity when needed
inietov Jun 28, 2023
85e717b
Fix cancel button style and translate title
inietov Jun 28, 2023
e2c2736
Delete (gulp) Form for bulk edit since is not used in this view
inietov Jun 28, 2023
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
Prev Previous commit
Next Next commit
Refactor Requestable@cancelRequest() firm to admit a user_id so we ca… 
…n cancel a request of whatever user we want
  • Loading branch information
@inietov
inietov committed Jun 27, 2023
commit eb4d7646015fe00ed9a499299e3aaa3945ae20cb
8 changes: 6 additions & 2 deletions app/Models/Requestable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,12 @@ public function deleteRequest()
$this->requests()->where('user_id', Auth::id())->delete();
}

public function cancelRequest()
public function cancelRequest($user_id = null)
{
$this->requests()->where('user_id', Auth::id())->update(['canceled_at' => \Carbon\Carbon::now()]);
if (!$user_id){
$user_id = Auth::id();
}

$this->requests()->where('user_id', $user_id)->update(['canceled_at' => \Carbon\Carbon::now()]);
}
}