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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/Exceptions/Handler.php
View File

@ -5,6 +5,10 @@ namespace App\Exceptions;
use Exception;
use Illuminate\Auth\Access\AuthorizationException;
use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler;
use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Log;
class Handler extends ExceptionHandler
{
@ -30,8 +34,9 @@ class Handler extends ExceptionHandler
/**
* Report or log an exception.
*
* @param \Exception $exception
* @param Exception $exception
* @return void
* @throws Exception
*/
public function report(Exception $exception)
{
@ -41,15 +46,22 @@ class Handler extends ExceptionHandler
/**
* Render an exception into an HTTP response.
*
* @param \Illuminate\Http\Request $request
* @param \Exception $exception
* @return \Illuminate\Http\Response
* @param Request $request
* @param Exception $exception
* @return Response
* @throws Exception
*/
public function render($request, Exception $exception)
{
// We'll render a 404 for any authorisation exceptions to hide the fact that the resource exists
if ($exception instanceof AuthorizationException)
if ($exception instanceof AuthorizationException) {
Log::error('Request not authorised',['user'=>Auth::user()->id,'request'=>$request->path()]);
if ($request->ajax())
return response()->json(['data'=>[]],200);
else
abort(404,'Not here...');
}
return parent::render($request, $exception);
}

15
app/Http/Controllers/SearchController.php
View File

@ -6,6 +6,7 @@ use Illuminate\Http\Request;
use Illuminate\Http\Response;
use Illuminate\Support\Facades\Auth;
use App\User;
use App\Models\{Account,Invoice,Service,Service\Adsl};
class SearchController extends Controller
@ -23,17 +24,17 @@ class SearchController extends Controller
return [];
$result = collect();
$accounts = Auth::user()->all_accounts()->pluck('id');
$accounts = ($x=Auth::user()->all_accounts())->pluck('id');
$users = $x->transform(function($item) { return $item->user;});
# Look for Account
foreach (Account::Search($request->input('term'))
->whereIN('id',$accounts)
->orderBy('company')
->orderBy('last_name')
->orderBy('first_name')
foreach (User::Search($request->input('term'))
->whereIN('id',$users->pluck('id'))
->orderBy('lastname')
->orderBy('firstname')
->limit(10)->get() as $o)
{
$result->push(['label'=>sprintf('AC:%s %s',$o->aid,$o->name),'value'=>'/u/account/'.$o->id]);
$result->push(['label'=>sprintf('US:%s %s',$o->aid,$o->name),'value'=>'/u/home/'.$o->id]);
}
# Look for a Service

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]);
}
}

15
app/Http/Controllers/UserServicesController.php
View File

@ -2,22 +2,23 @@
namespace App\Http\Controllers;
use Auth;
use Illuminate\Support\Facades\Auth;
use App\User;
class UserServicesController extends Controller
{
public function invoices()
public function invoices(User $o)
{
return ['data'=>Auth::user()->invoices_due->values()];
return ['data'=>$o->invoices_due->values()];
}
public function payments()
public function payments(User $o)
{
return ['data'=>Auth::user()->payment_history->values()];
return ['data'=>$o->payment_history->values()];
}
public function services()
public function services(User $o)
{
return ['data'=>Auth::user()->services_active->values()];
return ['data'=>$o->services_active->values()];
}
}

12
app/Models/Policies/AccountPolicy.php
View File

@ -14,7 +14,7 @@ class AccountPolicy
/**
* Determine whether the user can view the service.
*
* @param \App\User $user
* @param User $user
* @param Account $o
* @return mixed
*/
@ -33,7 +33,7 @@ class AccountPolicy
/**
* Determine whether the user can create services.
*
* @param \App\User $user
* @param User $user
* @return mixed
*/
public function create(User $user)
@ -44,7 +44,7 @@ class AccountPolicy
/**
* Determine whether the user can update the service.
*
* @param \App\User $user
* @param User $user
* @param Account $o
* @return mixed
*/
@ -56,7 +56,7 @@ class AccountPolicy
/**
* Determine whether the user can delete the service.
*
* @param \App\User $user
* @param User $user
* @param Account $o
* @return mixed
*/
@ -68,7 +68,7 @@ class AccountPolicy
/**
* Determine whether the user can restore the service.
*
* @param \App\User $user
* @param User $user
* @param Account $o
* @return mixed
*/
@ -80,7 +80,7 @@ class AccountPolicy
/**
* Determine whether the user can permanently delete the service.
*
* @param \App\User $user
* @param User $user
* @param Account $o
* @return mixed
*/

6
app/Models/Product.php
View File

@ -186,12 +186,12 @@ class Product extends Model
* @param int $period
* @return mixed
*/
public function price(int $period)
public function price(int $period,string $key='price_base')
{
return Arr::get(
$this->price_array,
sprintf('%s.1.price_base',$period),
Arr::get($this->price_array,sprintf('%s.0.price_base',$period))
sprintf('%s.1.%s',$period,$key),
Arr::get($this->price_array,sprintf('%s.0.%s',$period,$key))
);
}

29
app/Models/Service.php
View File

@ -522,6 +522,12 @@ class Service extends Model
return $this->product->name($this->account->language);
}
public function getRecurScheduleAttribute($value): int
{
// If recur_schedule not set, default to 2
return $value ?? 2;
}
/**
* @deprecated see getSIDAttribute()
*/
@ -568,7 +574,7 @@ class Service extends Model
*/
public function getSDescAttribute(): string
{
return $this->type->service_description;
return $this->type->service_description ?: 'Service Description NOT Defined for :'.$this->type->type;
}
/**
@ -583,7 +589,7 @@ class Service extends Model
*/
public function getSNameAttribute(): string
{
return $this->type->service_name;
return $this->type->service_name ?: 'Service Name NOT Defined for :'.$this->type->type;
}
/**
@ -596,7 +602,7 @@ class Service extends Model
{
switch($this->product->model) {
case 'App\Models\Product\Adsl': return 'broadband';
default: abort(500,'Product type not configured',['product'=>$this->product]);
default: return $this->type->type;
}
}
@ -770,6 +776,23 @@ class Service extends Model
$result->push($o);
}
// If pending, add any connection charges
if ($this->isPending()) {
$o = new InvoiceItem;
$o->active = TRUE;
$o->service_id = $this->id;
$o->product_id = $this->product_id;
$o->item_type = 4;
$o->price_base = $this->price ?: $this->product->price($this->recur_schedule,'price_setup'); // @todo change to a method in this class
//$o->recurring_schedule = $this->recur_schedule;
$o->date_start = $this->invoice_next;
$o->date_stop = $this->invoice_next;
$o->quantity = 1;
$o->addTaxes();
$result->push($o);
}
// Add additional charges
foreach ($this->charges->filter(function($item) { return ! $item->processed; }) as $oo) {
$o = new InvoiceItem;

90
app/Policies/UserPolicy.php Normal file
View File

@ -0,0 +1,90 @@
<?php
namespace App\Policies;
use Illuminate\Auth\Access\HandlesAuthorization;
use App\User;
class UserPolicy
{
use HandlesAuthorization;
/**
* Determine whether the user can view the service.
*
* @param User $user
* @param User $o
* @return mixed
*/
public function view(User $user, User $o)
{
// If this is a service for an account managed by a user.
return ($user->id == $o->id)
// The user is the wholesaler
OR $user->isWholesaler()
// The user is the reseller
OR $user->all_accounts()->pluck('id')->search($o->id);
}
/**
* Determine whether the user can create services.
*
* @param User $user
* @return mixed
*/
public function create(User $user)
{
//
}
/**
* Determine whether the user can update the service.
*
* @param User $user
* @param User $o
* @return mixed
*/
public function update(User $user, User $o)
{
//
}
/**
* Determine whether the user can delete the service.
*
* @param User $user
* @param User $o
* @return mixed
*/
public function delete(User $user, User $o)
{
//
}
/**
* Determine whether the user can restore the service.
*
* @param User $user
* @param User $o
* @return mixed
*/
public function restore(User $user, User $o)
{
//
}
/**
* Determine whether the user can permanently delete the service.
*
* @param User $user
* @param User $o
* @return mixed
*/
public function forceDelete(User $user, User $o)
{
//
}
}

41
app/User.php
View File

@ -104,7 +104,7 @@ class User extends Authenticatable
return $this->hasMany(static::class,'parent_id','id');
}
/** Attributes **/
/** ATTRIBUTES **/
public function getActiveDisplayAttribute($value)
{
@ -203,13 +203,50 @@ class User extends Authenticatable
$this->notify((new ResetPasswordNotification($token))->onQueue('high'));
}
/** Scopes **/
/** SCOPES */
public function scopeActive()
{
return $this->where('active',TRUE);
}
/**
* Search for a record
*
* @param $query
* @param string $term
* @return
*/
public function scopeSearch($query,string $term)
{
// Build our where clause
// First Name, Last name
if (preg_match('/\ /',$term)) {
list($fn,$ln) = explode(' ',$term,2);
$query->where(function($query1) use ($fn,$ln,$term) {
$query1->where(function($query2) use ($fn,$ln) {
return $query2
->where('firstname','like','%'.$fn.'%')
->where('lastname','like','%'.$ln.'%');
});
});
} elseif (is_numeric($term)) {
$query->where('id','like','%'.$term.'%');
} elseif (preg_match('/\@/',$term)) {
$query->where('email','like','%'.$term.'%');
} else {
$query
->Where('firstname','like','%'.$term.'%')
->orWhere('lastname','like','%'.$term.'%');
}
return $query;
}
/**
* Determine if the user is an admin of the account with $id
*

14
resources/theme/backend/adminlte/common/invoice/widget/due.blade.php
View File

@ -4,7 +4,7 @@
</div>
<div class="card-body">
@if ($user->invoices_due->count())
@if ($o->invoices_due->count())
<table class="table table-striped table-hover" id="invoices" style="width: 100%;">
<thead>
<tr>
@ -16,10 +16,10 @@
</thead>
<tfoot>
<tr>
<th>Count {{ $user->invoices_due->count() }}</th>
<th>Count {{ $o->invoices_due->count() }}</th>
{{-- @todo Number format should configured by currency --}}
<th class="right">{{ number_format($user->invoices_due->sum('total'),2) }}</th>
<th class="right">{{ number_format($user->invoices_due->sum('due'),2) }}</th>
<th class="right">{{ number_format($o->invoices_due->sum('total'),2) }}</th>
<th class="right">{{ number_format($o->invoices_due->sum('due'),2) }}</th>
<th>&nbsp;</th>
</tr>
</tfoot>
@ -31,8 +31,8 @@
</div>
@section('page-scripts')
@css('//cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css','jq-dt-css','jquery');
@js('//cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js','jq-dt-js','jquery');
@css('//cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css','jq-dt-css','jquery')
@js('//cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js','jq-dt-js','jquery')
@css('//cdn.datatables.net/responsive/2.2.1/css/responsive.dataTables.min.css','dt-responsive-css','jq-dt-css')
@js('//cdn.datatables.net/responsive/2.2.1/js/dataTables.responsive.min.js','dt-responsive-js','jq-dt-js')
@css('/plugin/dataTables/dataTables.bootstrap4.css','dt-bootstrap4-css','jq-dt-css')
@ -43,7 +43,7 @@
$('#invoices').DataTable( {
responsive: true,
ajax: {
url: "/api/u/invoices"
url: "/api/u/invoices/{{ $o->id }}"
},
columns: [
{ data: "invoice_id_url" },

4
resources/theme/backend/adminlte/common/invoice/widget/list.blade.php
View File

@ -24,8 +24,8 @@
</table>
@section('page-scripts')
@css('//cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css','jq-dt-css','jquery');
@js('//cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js','jq-dt-js','jquery');
@css('//cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css','jq-dt-css','jquery')
@js('//cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js','jq-dt-js','jquery')
@css('//cdn.datatables.net/responsive/2.2.1/css/responsive.dataTables.min.css','jq-dt-r-css','jq-dt-css')
@js('//cdn.datatables.net/responsive/2.2.1/js/dataTables.responsive.min.js','jq-dt-r-js','jq-dt-js')
@css('/plugin/dataTables/dataTables.bootstrap4.css','dt-bootstrap4-css','jq-dt-css')

8
resources/theme/backend/adminlte/common/payment/widget/history.blade.php
View File

@ -9,7 +9,7 @@
</div>
<div class="card-body">
@if ($user->payment_history->count())
@if ($o->payment_history->count())
<table class="table table-bordered table-striped table-hover" id="payments" style="width: 100%;">
<thead>
<tr>
@ -26,8 +26,8 @@
</div>
@section('page-scripts')
@css('//cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css','jq-dt-css','jquery');
@js('//cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js','jq-dt-js','jquery');
@css('//cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css','jq-dt-css','jquery')
@js('//cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js','jq-dt-js','jquery')
@css('//cdn.datatables.net/responsive/2.2.1/css/responsive.dataTables.min.css','dt-responsive-css','jq-dt-css')
@js('//cdn.datatables.net/responsive/2.2.1/js/dataTables.responsive.min.js','dt-responsive-js','jq-dt-js')
@css('/plugin/dataTables/dataTables.bootstrap4.css','dt-bootstrap4-css','jq-dt-css')
@ -38,7 +38,7 @@
$('#payments').DataTable( {
responsive: true,
ajax: {
url: "/api/u/payments"
url: "/api/u/payments/{{ $o->id }}"
},
columns: [
{ data: "payment_id_url" },

10
resources/theme/backend/adminlte/common/service/widget/active.blade.php
View File

@ -4,7 +4,7 @@
</div>
<div class="card-body">
@if ($user->services_active->count())
@if ($o->services_active->count())
<table class="table table-striped table-hover" id="services" style="width: 100%;">
<thead>
<tr>
@ -20,7 +20,7 @@
<tfoot>
<tr>
<th>Count {{ $user->services_active->count() }}</th>
<th>Count {{ $o->services_active->count() }}</th>
<th colspan="5">&nbsp;</th>
</tr>
</tfoot>
@ -33,8 +33,8 @@
</div>
@section('page-scripts')
@css('//cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css','jq-dt-css','jquery');
@js('//cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js','jq-dt-js','jquery');
@css('//cdn.datatables.net/1.10.19/css/jquery.dataTables.min.css','jq-dt-css','jquery')
@js('//cdn.datatables.net/1.10.19/js/jquery.dataTables.min.js','jq-dt-js','jquery')
@css('//cdn.datatables.net/responsive/2.2.1/css/responsive.dataTables.min.css','dt-responsive-css','jq-dt-css')
@js('//cdn.datatables.net/responsive/2.2.1/js/dataTables.responsive.min.js','dt-responsive-js','jq-dt-js')
@css('//cdn.datatables.net/rowgroup/1.0.2/css/rowGroup.dataTables.min.css','dt-rowgroup-css','jq-dt-css')
@ -47,7 +47,7 @@
$('#services').DataTable( {
responsive: true,
ajax: {
url: "/api/u/services"
url: "/api/u/services/{{ $o->id }}"
},
columns: [
{ data: "service_id_url" },

12
resources/theme/backend/adminlte/u/service.blade.php
View File

@ -18,7 +18,7 @@
<div class="row">
<!-- Service Details -->
<div class="col-5">
@include('u.service.widgets.'.$o->stype.'.details',['o'=>$o->type])
@includeIf('u.service.widgets.'.$o->stype.'.details',['o'=>$o->type])
@include('u.service.widgets.information')
</div>
@ -27,11 +27,15 @@
<div class="card-header bg-dark d-flex p-0">
<span class="p-3"><i class="fa fa-bars"></i></span>
<ul class="nav nav-pills p-2">
{{--
<li class="nav-item"><a class="nav-link active" href="#product" data-toggle="tab">Product</a></li>
<li class="nav-item"><a class="nav-link" href="#traffic" data-toggle="tab">Traffic</a></li>
<li class="nav-item"><a class="nav-link" href="#invoice_next" data-toggle="tab">Next Invoice</a></li>
--}}
<li class="nav-item active"><a class="nav-link" href="#invoice_next" data-toggle="tab">Next Invoice</a></li>
{{--
<li class="nav-item"><a class="nav-link" href="#invoices" data-toggle="tab">Invoices</a></li>
<li class="nav-item"><a class="nav-link" href="#emails" data-toggle="tab">Emails</a></li>
--}}
</ul>
@can('update',$o)
@ -57,10 +61,10 @@
<div class="tab-pane fade" id="traffic" role="tabpanel">
Traffic.
</div>
<div class="tab-pane fade show active" id="product" role="tabpanel">
<div class="tab-pane fade" id="product" role="tabpanel">
Product.
</div>
<div class="tab-pane fade" id="invoice_next" role="tabpanel">
<div class="tab-pane fade show active" id="invoice_next" role="tabpanel">
@include('common.service.widget.invoice')
</div>
<div class="tab-pane fade" id="invoices" role="tabpanel">

4
resources/theme/backend/adminlte/u/service/widgets/information.blade.php
View File

@ -5,6 +5,10 @@
<div class="card-body bg-light">
<table class="table table-sm">
<tr>
<th>Account</th>
<td>{{ $o->account->aid }}</td>
</tr>
<tr>
<th>Status</th>
<td>{!! $o->status_html !!}</td>

12
routes/api.php
View File

@ -28,7 +28,13 @@ Route::group(['middleware'=>['auth:api','role:reseller']], function() {
});
Route::group(['middleware'=>'auth:api'], function() {
Route::get('/u/invoices','UserServicesController@invoices');
Route::get('/u/payments','UserServicesController@payments');
Route::get('/u/services','UserServicesController@services');
Route::get('/u/invoices/{o}','UserServicesController@invoices')
->where('o','[0-9]+')
->middleware('can:view,o');;
Route::get('/u/payments/{o}','UserServicesController@payments')
->where('o','[0-9]+')
->middleware('can:view,o');;
Route::get('/u/services/{o}','UserServicesController@services')
->where('o','[0-9]+')
->middleware('can:view,o');;
});

50
routes/web.php
View File

@ -15,60 +15,64 @@ Auth::routes();
Route::get('/logout','Auth\LoginController@logout');
Route::group(['middleware'=>['theme:adminlte-be']],function() {
Route::get('auth/{socialProvider}', 'Auth\SocialLoginController@redirectToProvider');
Route::get('auth/{socialProvider}/callback', 'Auth\SocialLoginController@handleProviderCallback');
Route::get('auth/{socialProvider}/link', 'Auth\SocialLoginController@link');
Route::post('auth/{socialProvider}/linkcomplete', 'Auth\SocialLoginController@linkcomplete');
Route::get('auth/{socialProvider}','Auth\SocialLoginController@redirectToProvider');
Route::get('auth/{socialProvider}/callback','Auth\SocialLoginController@handleProviderCallback');
Route::get('auth/{socialProvider}/link','Auth\SocialLoginController@link');
Route::post('auth/{socialProvider}/linkcomplete','Auth\SocialLoginController@linkcomplete');
});
// Generic Image Renderer - Render images that we dont have with a generic image
Route::get('image/generic/{width}/{height}/{color}/{name?}','MediaController@image')->name('image');
// Our Admin Routes
Route::group(['middleware'=>['theme:adminlte-be','auth','role:wholesaler'],'prefix'=>'a'], function() {
Route::group(['middleware'=>['theme:adminlte-be','auth','role:wholesaler'],'prefix'=>'a'],function() {
Route::get('setup','AdminHomeController@setup');
Route::post('setup','AdminHomeController@setup_update');
Route::get('service/{o}', 'AdminHomeController@service');
Route::post('service/{o}', 'AdminHomeController@service_update');
Route::get('service/{o}','AdminHomeController@service');
Route::post('service/{o}','AdminHomeController@service_update');
//Route::get('accounting/connect', 'AccountingController@connect');
//Route::get('accounting/connect','AccountingController@connect');
});
Route::get('admin/switch/stop','\Leenooks\Controllers\AdminController@user_switch_stop')->name('switch.user.start')->middleware('auth');
// Our Reseller Routes
Route::group(['middleware'=>['theme:adminlte-be','auth','role:reseller'],'prefix'=>'r'], function() {
Route::get('supplier/index', 'SuppliersController@index');
Route::get('supplier/create', 'SuppliersController@create');
Route::post('supplier/store', 'SuppliersController@store');
Route::group(['middleware'=>['theme:adminlte-be','auth','role:reseller'],'prefix'=>'r'],function() {
Route::get('supplier/index','SuppliersController@index');
Route::get('supplier/create','SuppliersController@create');
Route::post('supplier/store','SuppliersController@store');
Route::get('switch/start/{id}','\Leenooks\Controllers\AdminController@user_switch_start')->name('switch.user.stop');
//Route::get('home/{o}', 'UserHomeController@user');
});
// Our User Routes
Route::group(['middleware'=>['theme:adminlte-be','auth'],'prefix'=>'u'], function() {
Route::get('home', 'UserHomeController@home');
Route::get('account/{o}', 'User\AccountController@view')
Route::group(['middleware'=>['theme:adminlte-be','auth'],'prefix'=>'u'],function() {
Route::get('home','UserHomeController@home');
Route::get('home/{o}','UserHomeController@home')
->where('o','[0-9]+')
->middleware('can:view,o');
Route::get('account/{o}/invoice', 'User\AccountController@view_invoice_next')
Route::get('account/{o}/invoice','User\AccountController@view_invoice_next')
->where('o','[0-9]+')
->middleware('can:view,o');
Route::get('invoice/{o}', 'UserHomeController@invoice')
Route::get('invoice/{o}','UserHomeController@invoice')
->where('o','[0-9]+')
->middleware('can:view,o');
Route::get('invoice/{o}/pdf','UserHomeController@invoice_pdf')
->where('o','[0-9]+')
->middleware('can:view,o');
Route::get('service/{o}', 'UserHomeController@service')
Route::get('service/{o}','UserHomeController@service')
->where('o','[0-9]+')
->middleware('can:view,o');
});
// Frontend Routes (Non-Authed Users)
Route::group(['middleware'=>['theme:metronic-fe']], function() {
Route::get('/', 'WelcomeController@index');
Route::group(['middleware'=>['theme:metronic-fe']],function() {
Route::get('/','WelcomeController@index');
Route::get('order','OrderController@index');
Route::post('order','OrderController@submit');
});
Route::get('product_order/{o}', 'OrderController@product_order');
Route::get('product_info/{o}', 'OrderController@product_info');
Route::get('product_order/{o}','OrderController@product_order');
Route::get('product_info/{o}','OrderController@product_info');
Route::redirect('/home','/u/home');
Route::demoAccess('/uc-access');
Route::redirect('/under-construction','http://www.graytech.net.au');