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

Changed account search to user search, show connection charges on invoice for pending services

Browse Source
This commit is contained in:
Deon George
2020-02-07 07:11:02 +09:00
parent ebd4367975
commit b61e00d80f
17 changed files with 314 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/Http/Controllers/UserHomeController.php
View File

@@ -2,6 +2,7 @@
namespace App\Http\Controllers;
use Illuminate\Contracts\View\Factory;
use Illuminate\Support\Facades\Auth;
use Illuminate\View\View;
use Barryvdh\Snappy\Facades\SnappyPdf as PDF;
@@ -19,22 +20,23 @@ class UserHomeController extends Controller
/**
* Logged in users home page
*
* @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
* @return Factory|View
*/
public function home(): View
public function home(User $o=NULL): View
{
if (is_null($o))
$o = Auth::user();
switch (Auth::user()->role()) {
case 'customer':
return View('u.home',['o'=>Auth::user()]);
return View('u.home',['o'=>$o]);
case 'reseller':
return View('r.home',['o'=>Auth::user()]);
case 'wholesaler':
return View('r.home',['o'=>Auth::user()]);
return View('r.home',['o'=>$o]);
default:
abort(500,'Unknown role: '.Auth::user()->role());
abort(500,'Unknown role: '.$o->role());
}
}
@@ -83,20 +85,5 @@ class UserHomeController extends Controller
public function service(Service $o): View
{
return View('u.service',['o'=>$o]);
foreach ([
sprintf('u.service.%s.%s',$o->type->type,$o->status),
sprintf('u.service.%s',$o->status),
] as $v)
if (view()->exists($v))
return View($v,['o'=>$o]);
// View doesnt exist, fall back to default view
return View('u.service',['o'=>$o]);
}
public function User(User $o)
{
// @todo Check authorised to see this account.
return View('u.home',['o'=>$o]);
}
}