ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplified checkout event handling per @uberbrady’s suggestion

Browse Source 
This generalizes the checkout events into the CheckoutableCheckedOut and CheckoutableCheckedIn events.
This commit is contained in:
Till Deeke
2018-09-10 16:40:26 +02:00
parent 62195a805a
commit 007e8fbdf9
23 changed files with 229 additions and 618 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Accessories/AccessoryCheckinController.php
+2 -2
View File
@@ -2,7 +2,7 @@
namespace App\Http\Controllers\Accessories;
use App\Events\AccessoryCheckedIn;
use App\Events\CheckoutableCheckedIn;
use App\Http\Controllers\Controller;
use App\Models\Accessory;
use App\Models\User;
@@ -64,7 +64,7 @@ class AccessoryCheckinController extends Controller
if (DB::table('accessories_users')->where('id', '=', $accessory_user->id)->delete()) {
$return_to = e($accessory_user->assigned_to);
event(new AccessoryCheckedIn($accessory, User::find($return_to), Auth::user(), $request->input('note')));
event(new CheckoutableCheckedIn($accessory, User::find($return_to), Auth::user(), $request->input('note')));
return redirect()->route("accessories.show", $accessory->id)->with('success', trans('admin/accessories/message.checkin.success'));
}
app/Http/Controllers/Accessories/AccessoryCheckoutController.php
+2 -2
View File
@@ -2,7 +2,7 @@
namespace App\Http\Controllers\Accessories;
use App\Events\AccessoryCheckedOut;
use App\Events\CheckoutableCheckedOut;
use App\Http\Controllers\Controller;
use App\Models\Accessory;
use App\Models\User;
@@ -80,7 +80,7 @@ class AccessoryCheckoutController extends Controller
DB::table('accessories_users')->where('assigned_to', '=', $accessory->assigned_to)->where('accessory_id', '=', $accessory->id)->first();
event(new AccessoryCheckedOut($accessory, $user, Auth::user(), $request->input('note')));
event(new CheckoutableCheckedOut($accessory, $user, Auth::user(), $request->input('note')));
// Redirect to the new accessory page
return redirect()->route('accessories.index')->with('success', trans('admin/accessories/message.checkout.success'));