deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move user suppliers to account suppliers

Browse Source
This commit is contained in:
Deon George
2024-07-23 22:17:09 +10:00
parent b145856ce9
commit 46075745d2
10 changed files with 236 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/Http/Controllers/UserController.php
View File

@@ -4,14 +4,12 @@ namespace App\Http\Controllers;
use Carbon\Carbon;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Session;
use Illuminate\Validation\Rule;
use App\Http\Requests\UserEdit;
use App\Models\{Supplier,User};
use App\Http\Requests\{AccountSupplierAdd,UserEdit};
use App\Models\{Account,Supplier,User};
class UserController extends Controller
{
@@ -38,23 +36,15 @@ class UserController extends Controller
/**
* Add a supplier to a user's profile
*
* @param Request $request
* @param User $o
* @return \Illuminate\Http\RedirectResponse
* @param AccountSupplierAdd $request
* @param Account $o
* @return RedirectResponse
*/
public function supplier_addedit(Request $request,User $o)
public function supplier_addedit(AccountSupplierAdd $request,Account $o): RedirectResponse
{
Session::put('supplier_update',true);
$validated = $request->validate([
'id'=> ['required','string',Rule::unique('supplier_user')->where(fn ($query) => $query->where('supplier_id',$request->supplier_id)->where('user_id','<>',$o->id))],
'supplier_id'=>'required|exists:suppliers,id',
]);
$o->suppliers()->attach([
$validated['supplier_id'] => [
'id'=>$validated['id'],
'site_id'=>$o->site_id,
$request->validated('supplier_id') => [
'supplier_ref'=>$request->validated('supplier_ref'),
'created_at'=>Carbon::now(),
]
]);
@@ -67,13 +57,13 @@ class UserController extends Controller
/**
* Remove a supplier from a user's profile
*
* @param User $o
* @param Account $o
* @param Supplier $so
* @return \Illuminate\Http\RedirectResponse
* @return RedirectResponse
*/
public function supplier_delete(User $o,Supplier $so)
public function supplier_delete(Account $o,Supplier $so): RedirectResponse
{
Session::put('supplier_update',true);
Session::put('supplier_update',TRUE);
$o->suppliers()->detach([$so->id]);