Update laravel framework from 9 to 11, removed some old packages
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 37s
Create Docker Image / Final Docker Image Manifest (push) Successful in 9s

This commit is contained in:
Deon George 2024-07-04 15:03:11 +10:00
parent d5be958de0
commit 3ff34af7f0
101 changed files with 1654 additions and 4061 deletions

View File

@ -1,9 +1,10 @@
APP_DEBUG=false
APP_NAME=OSB APP_NAME=OSB
APP_NAME_HTML_LONG="<b>Graytech</b>Hosting" APP_NAME_HTML_LONG="<b>Graytech</b>Hosting"
APP_NAME_HTML_SHORT="<b>G</b>H" APP_NAME_HTML_SHORT="<b>G</b>H"
APP_ENV=production APP_ENV=production
APP_KEY= APP_KEY=
APP_DEBUG=false APP_TIMEZONE=Australia/Melbourne
APP_URL=https://www.graytech.net.au APP_URL=https://www.graytech.net.au
LOG_CHANNEL=stack LOG_CHANNEL=stack
@ -17,7 +18,7 @@ DB_PASSWORD=
DB_SCHEMA=billing DB_SCHEMA=billing
BROADCAST_DRIVER=log BROADCAST_DRIVER=log
CACHE_DRIVER=file CACHE_STORE=file
SESSION_DRIVER=file SESSION_DRIVER=file
SESSION_LIFETIME=120 SESSION_LIFETIME=120
QUEUE_CONNECTION=database QUEUE_CONNECTION=database

View File

@ -4,8 +4,7 @@ namespace App\Http\Controllers;
use Illuminate\Support\Collection; use Illuminate\Support\Collection;
use App\Models\ProviderOauth; use App\Models\{ProviderOauth,User};
use App\Models\User;
class AccountingController extends Controller class AccountingController extends Controller
{ {
@ -32,8 +31,8 @@ class AccountingController extends Controller
$api = $to->API(); $api = $to->API();
return $api->getItems() return $api->getItems()
->pluck('pid','Id') ->pluck('pid','Id')
->transform(function($item,$value) { return ['id'=>$value,'value'=>$item]; }) ->transform(function($item,$value) { return ['id'=>$value,'value'=>$item]; })
->values(); ->values();
} }
} }

View File

@ -13,9 +13,7 @@ use App\Models\{Account,
Payment, Payment,
PaymentItem, PaymentItem,
Service, Service,
SiteDetail, SiteDetail};
Supplier,
SupplierDetail};
/** /**
* The AdminController governs all routes that are prefixed with 'a/'. * The AdminController governs all routes that are prefixed with 'a/'.
@ -27,7 +25,8 @@ class AdminController extends Controller
// @todo Move to reseller // @todo Move to reseller
public function service(Service $o) public function service(Service $o)
{ {
return View('a.service',['o'=>$o]); return view('theme.backend.adminlte.a.service')
->with('o',$o);
} }
// @todo Move to reseller // @todo Move to reseller
@ -55,18 +54,19 @@ class AdminController extends Controller
$o->forceFill($request->only(['account_id','charge_at','service_id','quantity','amount','sweep_type','type','taxable','description'])); $o->forceFill($request->only(['account_id','charge_at','service_id','quantity','amount','sweep_type','type','taxable','description']));
$o->save(); $o->save();
return redirect()->back() return redirect()
->back()
->with('success','Charge recorded: '.$o->id); ->with('success','Charge recorded: '.$o->id);
} }
return view('a.charge.addedit') return view('theme.backend.adminlte.a.charge.addedit')
->with('o',$o); ->with('o',$o);
} }
// @todo Move to reseller // @todo Move to reseller
public function charge_pending_account(Request $request,Account $o) public function charge_pending_account(Request $request,Account $o)
{ {
return view('a.charge.widgets.pending') return view('theme.backend.adminlte.a.charge.widgets.pending')
->with('list',$o->charges->where('active',TRUE)->where('processed',NULL)->except($request->exclude)); ->with('list',$o->charges->where('active',TRUE)->where('processed',NULL)->except($request->exclude));
} }
@ -78,7 +78,7 @@ class AdminController extends Controller
// @todo Move to reseller // @todo Move to reseller
public function charge_unprocessed() public function charge_unprocessed()
{ {
return view('a.charge.unprocessed'); return view('theme.backend.adminlte.a.charge.unprocessed');
} }
/** /**
@ -148,11 +148,12 @@ class AdminController extends Controller
$o->items()->save($oo); $o->items()->save($oo);
} }
return redirect()->back() return redirect()
->back()
->with('success','Payment recorded: '.$o->id); ->with('success','Payment recorded: '.$o->id);
} }
return view('a.payment.addedit') return view('theme.backend.adminlte.a.payment.addedit')
->with('o',$o); ->with('o',$o);
} }
@ -164,7 +165,7 @@ class AdminController extends Controller
// @todo Move to reseller // @todo Move to reseller
public function pay_unapplied() public function pay_unapplied()
{ {
return view('a.payment.unapplied'); return view('theme.backend.adminlte.a.payment.unapplied');
} }
/** /**
@ -177,7 +178,7 @@ class AdminController extends Controller
// @todo Move to reseller // @todo Move to reseller
public function pay_invoices(Request $request,Account $o) public function pay_invoices(Request $request,Account $o)
{ {
return view('a.payment.widgets.invoices') return view('theme.backend.adminlte.a.payment.widgets.invoices')
->with('pid',$request->pid) ->with('pid',$request->pid)
->with('o',$o); ->with('o',$o);
} }
@ -238,10 +239,11 @@ class AdminController extends Controller
$site->details()->save($oo); $site->details()->save($oo);
} }
return redirect()->back() return redirect()
->back()
->with('success','Settings saved'); ->with('success','Settings saved');
} }
return view('a.setup'); return view('theme.backend.adminlte.theme.backend.adminlte.a.setup');
} }
} }

View File

@ -4,8 +4,6 @@ namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use Illuminate\Foundation\Auth\SendsPasswordResetEmails; use Illuminate\Foundation\Auth\SendsPasswordResetEmails;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Password;
class ForgotPasswordController extends Controller class ForgotPasswordController extends Controller
{ {
@ -21,29 +19,4 @@ class ForgotPasswordController extends Controller
*/ */
use SendsPasswordResetEmails; use SendsPasswordResetEmails;
public function showLinkRequestForm()
{
return view('adminlte::auth.passwords.email');
}
public function sendResetLinkEmail(Request $request)
{
$this->validateEmail($request);
// If the account is not active, or doesnt exist, we'll send a fake "sent" message.
if (! ($x=$this->broker()->getUser($this->credentials($request))) || (! $x->active))
return $this->sendResetLinkResponse($request, Password::RESET_LINK_SENT);
// We will send the password reset link to this user. Once we have attempted
// to send the link, we will examine the response then see the message we
// need to show to the user. Finally, we'll send out a proper response.
$response = $this->broker()->sendResetLink(
$this->credentials($request)
);
return $response == Password::RESET_LINK_SENT
? $this->sendResetLinkResponse($request, $response)
: $this->sendResetLinkFailedResponse($request, $response);
}
} }

View File

@ -3,8 +3,6 @@
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Carbon\Carbon;
use Illuminate\Foundation\Auth\AuthenticatesUsers; use Illuminate\Foundation\Auth\AuthenticatesUsers;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
@ -12,35 +10,36 @@ use Illuminate\Support\Facades\Schema;
class LoginController extends Controller class LoginController extends Controller
{ {
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Login Controller | Login Controller
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| This controller handles authenticating users for the application and | This controller handles authenticating users for the application and
| redirecting them to your home screen. The controller uses a trait | redirecting them to your home screen. The controller uses a trait
| to conveniently provide its functionality to your applications. | to conveniently provide its functionality to your applications.
| |
*/ */
use AuthenticatesUsers; use AuthenticatesUsers;
/** /**
* Where to redirect users after login. * Where to redirect users after login.
* *
* @var string * @var string
*/ */
protected $redirectTo = RouteServiceProvider::HOME; protected $redirectTo = '/home';
/** /**
* Create a new controller instance. * Create a new controller instance.
* *
* @return void * @return void
*/ */
public function __construct() public function __construct()
{ {
$this->middleware('guest')->except('logout'); $this->middleware('auth')
} ->only('logout');
}
public function login(Request $request) public function login(Request $request)
{ {
@ -73,6 +72,7 @@ class LoginController extends Controller
if (file_exists('login_note.txt')) if (file_exists('login_note.txt'))
$login_note = file_get_contents('login_note.txt'); $login_note = file_get_contents('login_note.txt');
return view('adminlte::auth.login')->with('login_note',$login_note); return view('adminlte::auth.login')
->with('login_note',$login_note);
} }
} }

View File

@ -1,89 +0,0 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use App\Models\User;
use Illuminate\Foundation\Auth\RegistersUsers;
use Illuminate\Support\Facades\Hash;
use Illuminate\Support\Facades\Validator;
class RegisterController extends Controller
{
/*
|--------------------------------------------------------------------------
| Register Controller
|--------------------------------------------------------------------------
|
| This controller handles the registration of new users as well as their
| validation and creation. By default this controller uses a trait to
| provide this functionality without requiring any additional code.
|
*/
use RegistersUsers;
/**
* Where to redirect users after registration.
*
* @var string
*/
protected $redirectTo = RouteServiceProvider::HOME;
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
}
/**
* Get a validator for an incoming registration request.
*
* @param array $data
* @return \Illuminate\Contracts\Validation\Validator
*/
protected function validator(array $data)
{
return Validator::make($data, [
'name' => ['required', 'string', 'min:3', 'max:255'],
'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
'password' => ['required', 'string', 'min:8', 'confirmed'],
'token' => 'required|doorman:email',
]);
}
/**
* Create a new user instance after a valid registration.
*
* @param array $data
* @return User
*/
protected function create(array $data): User
{
$fields = [
'name' => $data['name'],
'email' => $data['email'],
'password' => Hash::make($data['password']),
];
if (config('auth.providers.users.field','email') === 'username' && isset($data['username'])) {
$fields['username'] = $data['username'];
}
try {
Doorman::redeem($data['token'],$data['email']);
// @todo Want to direct or display an appropriate error message (although the form validation does it anyway).
} catch (DoormanException $e) {
redirect('/error');
abort(403);
}
return User::create($fields);
}
}

View File

@ -3,9 +3,7 @@
namespace App\Http\Controllers\Auth; namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Providers\RouteServiceProvider;
use Illuminate\Foundation\Auth\ResetsPasswords; use Illuminate\Foundation\Auth\ResetsPasswords;
use Illuminate\Http\Request;
class ResetPasswordController extends Controller class ResetPasswordController extends Controller
{ {
@ -27,22 +25,5 @@ class ResetPasswordController extends Controller
* *
* @var string * @var string
*/ */
protected $redirectTo = RouteServiceProvider::HOME; protected $redirectTo = '/home';
}
/**
* Create a new controller instance.
*
* @return void
*/
public function __construct()
{
$this->middleware('guest');
}
public function showResetForm(Request $request, $token = null)
{
return view('adminlte::auth.passwords.reset')->with(
['token' => $token, 'email' => $request->email]
);
}
}

View File

@ -12,13 +12,13 @@ use Laravel\Socialite\Facades\Socialite;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Mail\SocialLink; use App\Mail\SocialLink;
use App\Models\{ProviderOauth,ProviderToken,User,UserOauth}; use App\Models\{ProviderOauth,ProviderToken,User,UserOauth};
use App\Providers\RouteServiceProvider;
class SocialLoginController extends Controller class SocialLoginController extends Controller
{ {
public function redirectToProvider($provider) public function redirectToProvider($provider)
{ {
return Socialite::with($provider)->redirect(); return Socialite::with($provider)
->redirect();
} }
public function handleProviderCallback($provider) public function handleProviderCallback($provider)
@ -77,7 +77,8 @@ class SocialLoginController extends Controller
} }
} }
return redirect()->intended(RouteServiceProvider::HOME); return redirect()
->intended('/home');
} }
public function handleBearerTokenCallback($provider) public function handleBearerTokenCallback($provider)
@ -101,7 +102,7 @@ class SocialLoginController extends Controller
$po->tokens()->save($uoo); $po->tokens()->save($uoo);
return redirect() return redirect()
->intended(RouteServiceProvider::HOME) ->intended('/home')
->with('success','Token refreshed.'); ->with('success','Token refreshed.');
} }
@ -141,8 +142,9 @@ class SocialLoginController extends Controller
$aoo->user_id = $uo->id; $aoo->user_id = $uo->id;
$aoo->save(); $aoo->save();
Auth::login($uo,FALSE); Auth::login($uo);
return redirect()->intended(RouteServiceProvider::HOME); return redirect()
->intended('/home');
} }
} }

View File

@ -33,7 +33,8 @@ class CheckoutController extends Controller
return redirect()->back()->withErrors($e->getMessage())->withInput(); return redirect()->back()->withErrors($e->getMessage())->withInput();
} }
return redirect()->back() return redirect()
->back()
->with('success','Payment saved'); ->with('success','Payment saved');
} }
@ -44,9 +45,10 @@ class CheckoutController extends Controller
} }
if (! $request->session()->get('invoice.cart')) if (! $request->session()->get('invoice.cart'))
return redirect()->to('u/home'); return redirect()
->to('u/home');
return View('u.invoice.cart') return view('theme.backend.adminlte.u.invoice.cart')
->with('invoices',Invoice::find(array_values($request->session()->get('invoice.cart')))); ->with('invoices',Invoice::find(array_values($request->session()->get('invoice.cart'))));
} }
@ -62,7 +64,7 @@ class CheckoutController extends Controller
*/ */
public function home(): View public function home(): View
{ {
return View('payment.home'); return view('theme.backend.adminlte.payment.home');
} }
public function pay(Request $request,Checkout $o) public function pay(Request $request,Checkout $o)
@ -78,6 +80,6 @@ class CheckoutController extends Controller
*/ */
public function view(Checkout $o): View public function view(Checkout $o): View
{ {
return View('payment.view',['o'=>$o]); return view('theme.backend.adminlte.payment.view',['o'=>$o]);
} }
} }

View File

@ -3,11 +3,9 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests; use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
class Controller extends BaseController abstract class Controller extends \Illuminate\Routing\Controller
{ {
use AuthorizesRequests, DispatchesJobs, ValidatesRequests; use AuthorizesRequests, ValidatesRequests;
} }

View File

@ -31,7 +31,8 @@ class HomeController extends Controller
if (! $o->exists) if (! $o->exists)
$o = Auth::user(); $o = Auth::user();
return View('home',['o'=>$o]); return view('theme.backend.adminlte.home')
->with(['o'=>$o]);
} }
/** /**

View File

@ -25,7 +25,8 @@ class InvoiceController extends Controller
*/ */
public function pdf(Invoice $o) public function pdf(Invoice $o)
{ {
return PDF::loadView('u.invoice.home',['o'=>$o])->stream(sprintf('%s.pdf',$o->sid)); return PDF::loadView('theme.backend.adminlte.u.invoice.home',['o'=>$o])
->stream(sprintf('%s.pdf',$o->sid));
} }
/** /**
@ -36,6 +37,7 @@ class InvoiceController extends Controller
*/ */
public function view(Invoice $o): View public function view(Invoice $o): View
{ {
return View('invoice.view',['o'=>$o]); return view('theme.backend.adminlte.invoice.view')
->with('o',$o);
} }
} }

View File

@ -1,27 +0,0 @@
<?php
namespace App\Http\Controllers;
use Image;
class MediaController extends Controller
{
/**
* Create a generic image
*
* @param $width
* @param $height
* @param string $color
* @return mixed
*/
public function image($width,$height,$color='#ccc') {
$io = Image::canvas($width,$height,$color);
$io->text(sprintf('IMAGE-%sx%s',$width,$height),$width/2,$height/2,function($font) {
$font->file(5);
$font->align('center');
$font->valign('middle');
});
return $io->response();
}
}

View File

@ -3,7 +3,6 @@
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use Igaster\LaravelTheme\Facades\Theme;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Mail; use Illuminate\Support\Facades\Mail;
use Illuminate\Support\Facades\Validator; use Illuminate\Support\Facades\Validator;
@ -23,23 +22,21 @@ class OrderController extends Controller
// @todo To check // @todo To check
public function index() public function index()
{ {
return view('order.home'); return view('theme.backend.adminlte.order.home');
} }
// @todo To check // @todo To check
public function product_order(Product $o) public function product_order(Product $o)
{ {
Theme::set('metronic-fe'); return view('theme.backend.adminlte.order.widget.order')
->with('o',$o);
return view('order.widget.order',['o'=>$o]);
} }
// @todo To check // @todo To check
public function product_info(Product $o) public function product_info(Product $o)
{ {
Theme::set('metronic-fe'); return view('theme.backend.adminlte.order.widget.info')
->with('o',$o);
return view('order.widget.info',['o'=>$o]);
} }
// @todo To check // @todo To check
@ -122,9 +119,11 @@ class OrderController extends Controller
$order->save(); $order->save();
} }
// @todo Move this email to a config item
Mail::to('help@graytech.net.au') Mail::to('help@graytech.net.au')
->queue((new OrderRequest($so,$request->input('options.notes') ?: ''))->onQueue('email')); //@todo Get email from DB. ->queue((new OrderRequest($so,$request->input('options.notes') ?: ''))->onQueue('email')); //@todo Get email from DB.
return view('order_received',['o'=>$so]); return view('theme.backend.adminlte.order_received')
->with('o',$so);
} }
} }

View File

@ -85,7 +85,7 @@ class ProductController extends Controller
if (! $o->exists && $request->name) if (! $o->exists && $request->name)
$o = Product::where('name',$request->name)->firstOrNew(); $o = Product::where('name',$request->name)->firstOrNew();
return view('product.details') return view('theme.backend.adminlte.product.details')
->with('breadcrumb',collect(['Products'=>url('a/product')])) ->with('breadcrumb',collect(['Products'=>url('a/product')]))
->with('o',$o); ->with('o',$o);
} }
@ -131,7 +131,8 @@ class ProductController extends Controller
], ],
]); ]);
return redirect()->back() return redirect()
->back()
->with('success','Product saved'); ->with('success','Product saved');
} }
@ -143,6 +144,6 @@ class ProductController extends Controller
*/ */
public function home() public function home()
{ {
return view('product.home'); return view('theme.backend.adminlte.product.home');
} }
} }

View File

@ -93,6 +93,8 @@ class SearchController extends Controller
} }
} }
return $result->sortBy(function($item) { return $item['category'].$item['name']; })->values(); return $result
->sortBy(function($item) { return $item['category'].$item['name']; })
->values();
} }
} }

View File

@ -114,7 +114,7 @@ class ServiceController extends Controller
return redirect()->to(url('u/service',[$o->id])); return redirect()->to(url('u/service',[$o->id]));
} }
return view('service.change_pending') return view('theme.backend.adminlte.service.change_pending')
->with('breadcrumb',collect()->merge($o->account->breadcrumb)) ->with('breadcrumb',collect()->merge($o->account->breadcrumb))
->with('o',$o) ->with('o',$o)
->with('np',$np); ->with('np',$np);
@ -149,7 +149,7 @@ class ServiceController extends Controller
return redirect('u/service/'.$o->id)->with('success','Cancellation lodged'); return redirect('u/service/'.$o->id)->with('success','Cancellation lodged');
} }
return view('service.cancel_request') return view('theme.backend.adminlte.service.cancel_request')
->with('o',$o); ->with('o',$o);
} }
@ -258,7 +258,7 @@ class ServiceController extends Controller
switch (get_class($o->type)) { switch (get_class($o->type)) {
default: default:
return view('service.change_request') return view('theme.backend.adminlte.service.change_request')
->with('breadcrumb',collect()->merge($o->account->breadcrumb)) ->with('breadcrumb',collect()->merge($o->account->breadcrumb))
->with('o',$o); ->with('o',$o);
} }
@ -279,7 +279,7 @@ class ServiceController extends Controller
->with(['service.account','registrar']) ->with(['service.account','registrar'])
->get(); ->get();
return view('service.domain.list') return view('theme.backend.adminlte.service.domain.list')
->with('o',$o); ->with('o',$o);
} }
@ -293,7 +293,7 @@ class ServiceController extends Controller
->with(['service.account','service.product.type.supplied.supplier_detail.supplier','tld']) ->with(['service.account','service.product.type.supplied.supplier_detail.supplier','tld'])
->get(); ->get();
return view('service.email.list') return view('theme.backend.adminlte.service.email.list')
->with('o',$o); ->with('o',$o);
} }
@ -305,7 +305,7 @@ class ServiceController extends Controller
*/ */
public function home(Service $o): View public function home(Service $o): View
{ {
return View('service.home') return view('theme.backend.adminlte.service.home')
->with('breadcrumb',collect()->merge($o->account->breadcrumb)) ->with('breadcrumb',collect()->merge($o->account->breadcrumb))
->with('o',$o); ->with('o',$o);
} }
@ -320,7 +320,7 @@ class ServiceController extends Controller
->with(['service.account','service.product.type.supplied.supplier_detail.supplier','tld']) ->with(['service.account','service.product.type.supplied.supplier_detail.supplier','tld'])
->get(); ->get();
return view('service.host.list') return view('theme.backend.adminlte.service.host.list')
->with('o',$o); ->with('o',$o);
} }
@ -401,7 +401,7 @@ class ServiceController extends Controller
*/ */
public function service_change_charges_display(Request $request,Service $o) public function service_change_charges_display(Request $request,Service $o)
{ {
return view('a.charge.service_change') return view('theme.backend.adminlte.a.charge.service_change')
->with('charges',$this->service_change_charges($request,$o)); ->with('charges',$this->service_change_charges($request,$o));
} }

View File

@ -46,7 +46,8 @@ class SupplierController extends Controller
])->filter(); ])->filter();
$o->detail()->save($oo); $o->detail()->save($oo);
return redirect()->back() return redirect()
->back()
->with('success','Supplier Saved'); ->with('success','Supplier Saved');
} }
@ -60,7 +61,7 @@ class SupplierController extends Controller
{ {
$this->middleware(['auth','wholesaler']); $this->middleware(['auth','wholesaler']);
return view('supplier.home'); return view('theme.backend.adminlte.supplier.home');
} }
/** /**
@ -72,12 +73,14 @@ class SupplierController extends Controller
public function cost(Cost $o) public function cost(Cost $o)
{ {
// @todo Need to add the services that are active that are not on the bill for the supplier. // @todo Need to add the services that are active that are not on the bill for the supplier.
return view('supplier.cost.view',['o'=>$o]); return view('theme.backend.adminlte.supplier.cost.view')
->with('o',$o);
} }
public function cost_add(Supplier $o) public function cost_add(Supplier $o)
{ {
return view('supplier.cost.add',['o'=>$o]); return view('theme.backend.adminlte.supplier.cost.add')
->with('o',$o);
} }
public function cost_submit(Request $request,Supplier $o) public function cost_submit(Request $request,Supplier $o)
@ -106,7 +109,7 @@ class SupplierController extends Controller
*/ */
public function product_add() public function product_add()
{ {
return view('supplier.product.addedit') return view('theme.backend.adminlte.supplier.product.addedit')
->with('o',new Supplier) ->with('o',new Supplier)
->with('oo',NULL); ->with('oo',NULL);
} }
@ -176,7 +179,7 @@ class SupplierController extends Controller
$oo = $o->detail->find($type,$id); $oo = $o->detail->find($type,$id);
$oo->load(['products.product.services.product.type']); $oo->load(['products.product.services.product.type']);
return view('supplier.product.addedit') return view('theme.backend.adminlte.supplier.product.addedit')
->with('o',$o) ->with('o',$o)
->with('oo',$oo); ->with('oo',$oo);
} }
@ -199,7 +202,7 @@ class SupplierController extends Controller
if ($o) if ($o)
$o->load(['products.product.services']); $o->load(['products.product.services']);
return view('supplier.product.widget.'.$type) return view('theme.backend.adminlte.supplier.product.widget.'.$type)
->with('o',$id ? $o : NULL) ->with('o',$id ? $o : NULL)
->withErrors($request->errors); ->withErrors($request->errors);
} }
@ -214,7 +217,7 @@ class SupplierController extends Controller
{ {
$this->middleware(['auth','wholesaler']); $this->middleware(['auth','wholesaler']);
return view('supplier.details') return view('theme.backend.adminlte.supplier.details')
->with('o',$o); ->with('o',$o);
} }
} }

View File

@ -38,6 +38,7 @@ class AccountController extends Controller
$io->items->push($o); $io->items->push($o);
} }
return View('u.invoice.home',['o'=>$io]); return view('theme.backend.adminlte.u.invoice.home')
->with('o',$io);
} }
} }

View File

@ -35,7 +35,9 @@ class UserController extends Controller
] ]
]); ]);
return redirect()->back()->with('success','Supplier Added'); return redirect()
->back()
->with('success','Supplier Added');
} }
/** /**
@ -51,6 +53,8 @@ class UserController extends Controller
$o->suppliers()->detach([$so->id]); $o->suppliers()->detach([$so->id]);
return redirect()->back()->with('success','Supplier Deleted'); return redirect()
->back()
->with('success','Supplier Deleted');
} }
} }

View File

@ -1,13 +0,0 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
class WelcomeController extends Controller
{
public function home() {
return view('welcome.home');
}
}

View File

@ -1,84 +0,0 @@
<?php
namespace App\Http;
use Illuminate\Foundation\Http\Kernel as HttpKernel;
class Kernel extends HttpKernel
{
/**
* The application's global HTTP middleware stack.
*
* These middleware are run during every request to your application.
*
* @var array
*/
protected $middleware = [
\App\Http\Middleware\CheckForMaintenanceMode::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
\App\Http\Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\App\Http\Middleware\TrustProxies::class,
\App\Http\Middleware\SetSite::class,
];
/**
* The application's route middleware groups.
*
* @var array
*/
protected $middlewareGroups = [
'web' => [
\App\Http\Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
// \Illuminate\Session\Middleware\AuthenticateSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\Laravel\Passport\Http\Middleware\CreateFreshApiToken::class,
],
'api' => [
'throttle:60,1',
'bindings',
],
];
/**
* The application's route middleware.
*
* These middleware may be assigned to groups or used individually.
*
* @var array
*/
protected $routeMiddleware = [
'auth' => \App\Http\Middleware\Authenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class,
'role' => \App\Http\Middleware\Role::class,
'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class,
'theme' => \Igaster\LaravelTheme\Middleware\setTheme::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class,
];
/**
* The priority-sorted list of middleware.
*
* This forces non-global middleware to always be in the given order.
*
* @var array
*/
protected $middlewarePriority = [
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
\App\Http\Middleware\Authenticate::class,
\Illuminate\Session\Middleware\AuthenticateSession::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
\Illuminate\Auth\Middleware\Authorize::class,
];
}

View File

@ -1,21 +0,0 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Auth\Middleware\Authenticate as Middleware;
class Authenticate extends Middleware
{
/**
* Get the path the user should be redirected to when they are not authenticated.
*
* @param \Illuminate\Http\Request $request
* @return string
*/
protected function redirectTo($request)
{
if (! $request->expectsJson()) {
return route('login');
}
}
}

View File

@ -1,17 +0,0 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode as Middleware;
class CheckForMaintenanceMode extends Middleware
{
/**
* The URIs that should be reachable while maintenance mode is enabled.
*
* @var array
*/
protected $except = [
//
];
}

View File

@ -1,17 +0,0 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
class EncryptCookies extends Middleware
{
/**
* The names of the cookies that should not be encrypted.
*
* @var array
*/
protected $except = [
'toggleState',
];
}

View File

@ -1,26 +0,0 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Illuminate\Support\Facades\Auth;
class RedirectIfAuthenticated
{
/**
* Handle an incoming request.
*
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @param string|null $guard
* @return mixed
*/
public function handle($request, Closure $next, $guard = null)
{
if (Auth::guard($guard)->check()) {
return redirect('/home');
}
return $next($request);
}
}

View File

@ -2,6 +2,7 @@
namespace App\Http\Middleware; namespace App\Http\Middleware;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Closure; use Closure;
@ -10,7 +11,7 @@ use Closure;
*/ */
class Role class Role
{ {
public function handle($request, Closure $next, $role) public function handle(Request $request, Closure $next, string $role)
{ {
if ($role AND ! Auth::user()) if ($role AND ! Auth::user())
abort(403,'Not Authenticated'); abort(403,'Not Authenticated');

View File

@ -2,6 +2,7 @@
namespace App\Http\Middleware; namespace App\Http\Middleware;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Schema; use Illuminate\Support\Facades\Schema;
use Illuminate\Support\Facades\Config; use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\View; use Illuminate\Support\Facades\View;
@ -18,13 +19,11 @@ use App\Models\Site;
class SetSite class SetSite
{ {
/** /**
* Handle an incoming request. * @param Request $request
* * @param Closure $next
* @param \Illuminate\Http\Request $request
* @param \Closure $next
* @return mixed * @return mixed
*/ */
public function handle($request, Closure $next) public function handle(Request $request,Closure $next)
{ {
$so = new Site; $so = new Site;

View File

@ -1,18 +0,0 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
class TrimStrings extends Middleware
{
/**
* The names of the attributes that should not be trimmed.
*
* @var array
*/
protected $except = [
'password',
'password_confirmation',
];
}

View File

@ -1,28 +0,0 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Http\Request;
use Illuminate\Http\Middleware\TrustProxies as Middleware;
class TrustProxies extends Middleware
{
/**
* The trusted proxies for this application.
*
* @var array
*/
protected $proxies;
/**
* The headers that should be used to detect proxies.
*
* @var int
*/
protected $headers =
Request::HEADER_X_FORWARDED_FOR |
Request::HEADER_X_FORWARDED_HOST |
Request::HEADER_X_FORWARDED_PORT |
Request::HEADER_X_FORWARDED_PROTO |
Request::HEADER_X_FORWARDED_AWS_ELB;
}

View File

@ -1,24 +0,0 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
class VerifyCsrfToken extends Middleware
{
/**
* Indicates whether the XSRF-TOKEN cookie should be set on the response.
*
* @var bool
*/
protected $addHttpCookie = true;
/**
* The URIs that should be excluded from CSRF verification.
*
* @var array
*/
protected $except = [
//
];
}

View File

@ -2,7 +2,6 @@
namespace App\Models; namespace App\Models;
use Awobaz\Compoships\Compoships;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Arr; use Illuminate\Support\Arr;
@ -17,7 +16,7 @@ use App\Traits\SiteID;
*/ */
class Charge extends Model class Charge extends Model
{ {
use Compoships,SiteID; use SiteID;
protected $casts = [ protected $casts = [
'attributes' => 'json', 'attributes' => 'json',

View File

@ -2,7 +2,6 @@
namespace App\Models; namespace App\Models;
use Awobaz\Compoships\Compoships;
use Illuminate\Database\Eloquent\Collection; use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Arr; use Illuminate\Support\Arr;
@ -21,7 +20,7 @@ use App\Traits\PushNew;
*/ */
class InvoiceItem extends Model class InvoiceItem extends Model
{ {
use Compoships,PushNew; use PushNew;
protected $dates = [ protected $dates = [
'start_at', 'start_at',

View File

@ -27,8 +27,8 @@ class Payment extends Model implements IDs
{ {
use PushNew,ScopeActive,ProviderRef; use PushNew,ScopeActive,ProviderRef;
protected $dates = [ protected $casts = [
'paid_at', 'paid_at'=>'datetime:Y-m-d',
]; ];
// Array of items that can be updated with PushNew // Array of items that can be updated with PushNew

View File

@ -17,9 +17,9 @@ class UserPolicy
* @param string $ability * @param string $ability
* @return bool|null * @return bool|null
*/ */
public function before(User $uo,string $ability): ?bool public function before(User $uo,string $ability): bool
{ {
return $uo->isWholesaler() ?: NULL; return $uo->isWholesaler() ?: FALSE;
} }
/** /**

View File

@ -2,7 +2,6 @@
namespace App\Models; namespace App\Models;
use Awobaz\Compoships\Compoships;
use Illuminate\Container\Container; use Illuminate\Container\Container;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
@ -66,7 +65,7 @@ use App\Traits\{ProductDetails,ProviderRef,SiteID};
*/ */
class Product extends Model implements IDs class Product extends Model implements IDs
{ {
use Compoships,HasFactory,SiteID,ProductDetails,ScopeActive,ProviderRef; use HasFactory,SiteID,ProductDetails,ScopeActive,ProviderRef;
protected $casts = [ protected $casts = [
'pricing'=>'collection', 'pricing'=>'collection',

View File

@ -20,9 +20,9 @@ class Broadband extends Type implements ServiceUsage
{ {
private const LOGKEY = 'MSB'; private const LOGKEY = 'MSB';
protected $dates = [ protected $casts = [
'connect_at', 'connect_at'=>'datetime:Y-m-d',
'expire_at', 'expire_at'=>'datetime:Y-m-d',
]; ];
protected $table = 'service_broadband'; protected $table = 'service_broadband';

View File

@ -72,11 +72,11 @@ class Site extends Model
*/ */
public function getAddressAttribute(): array public function getAddressAttribute(): array
{ {
return [ return array_filter([
$this->site_address1, $this->site_address1,
$this->site_address2, $this->site_address2,
sprintf('%s %s %s',$this->site_city.(($this->site_state OR $this->site_postcode) ? ',' : ''),$this->site_state,$this->site_postcode) sprintf('%s %s %s',$this->site_city.(($this->site_state OR $this->site_postcode) ? ',' : ''),$this->site_state,$this->site_postcode)
]; ]);
} }
/** /**

View File

@ -9,7 +9,10 @@ use App\Models\Service\Broadband as ServiceBroadband;
class Broadband extends Model class Broadband extends Model
{ {
protected $dates = ['date']; protected $casts = [
'date'=>'datetime:Y-m-d',
];
protected $table = 'usage_broadband'; protected $table = 'usage_broadband';
public $timestamps = FALSE; public $timestamps = FALSE;

View File

@ -17,7 +17,7 @@ use Leenooks\Traits\UserSwitch;
use App\Interfaces\IDs; use App\Interfaces\IDs;
use App\Models\Scopes\SiteScope; use App\Models\Scopes\SiteScope;
use App\Notifications\ResetPassword as ResetPasswordNotification; use App\Notifications\ResetPassword as ResetPasswordNotification;
use App\Traits\{QueryCacheableConfig,SiteID}; use App\Traits\SiteID;
/** /**
* Class User * Class User
@ -27,7 +27,7 @@ use App\Traits\{QueryCacheableConfig,SiteID};
*/ */
class User extends Authenticatable implements IDs class User extends Authenticatable implements IDs
{ {
use HasFactory,HasApiTokens,Notifiable,UserSwitch,QueryCacheableConfig,SiteID,ScopeActive; use HasFactory,HasApiTokens,Notifiable,UserSwitch,SiteID,ScopeActive;
private const CACHE_TIME = 3600; private const CACHE_TIME = 3600;

View File

@ -2,8 +2,8 @@
namespace App\Providers; namespace App\Providers;
use Illuminate\Support\Facades\Gate;
use Illuminate\Support\ServiceProvider; use Illuminate\Support\ServiceProvider;
use Laravel\Passport\Passport;
use Leenooks\Traits\SingleOrFail; use Leenooks\Traits\SingleOrFail;
class AppServiceProvider extends ServiceProvider class AppServiceProvider extends ServiceProvider
@ -12,21 +12,25 @@ class AppServiceProvider extends ServiceProvider
/** /**
* Register any application services. * Register any application services.
*
* @return void
*/ */
public function register() public function register(): void
{ {
Passport::ignoreMigrations();
} }
/** /**
* Bootstrap any application services. * Bootstrap any application services.
*
* @return void
*/ */
public function boot() public function boot(): void
{ {
SingleOrFail::bootSingleOrfail(); self::bootSingleOrfail();
Gate::define('wholesaler', function ($user) {
return $user->isWholesaler();
});
Gate::define('reseller', function ($user) {
return $user->isReseller();
});
} }
} }

View File

@ -1,43 +0,0 @@
<?php
namespace App\Providers;
use Intuit\Traits\IntuitSocialite;
use Laravel\Passport\Passport;
use Illuminate\Support\Facades\Gate;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
class AuthServiceProvider extends ServiceProvider
{
use IntuitSocialite;
/**
* The policy mappings for the application.
*
* @var array
*/
protected $policies = [
'App\Model' => 'App\Policies\ModelPolicy',
];
/**
* Register any authentication / authorization services.
*
* @return void
*/
public function boot()
{
$this->registerPolicies();
$this->bootIntuitSocialite();
Passport::routes();
// Passport::enableImplicitGrant();
Gate::define('wholesaler', function ($user) {
return $user->isWholesaler();
});
Gate::define('reseller', function ($user) {
return $user->isReseller();
});
}
}

View File

@ -1,21 +0,0 @@
<?php
namespace App\Providers;
use Illuminate\Support\ServiceProvider;
use Illuminate\Support\Facades\Broadcast;
class BroadcastServiceProvider extends ServiceProvider
{
/**
* Bootstrap any application services.
*
* @return void
*/
public function boot()
{
Broadcast::routes();
require base_path('routes/channels.php');
}
}

View File

@ -1,36 +0,0 @@
<?php
namespace App\Providers;
use Illuminate\Support\Facades\Event;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
use App\Listeners\ProviderPaymentCreated;
class EventServiceProvider extends ServiceProvider
{
/**
* The event listener mappings for the application.
*
* @var array
*/
protected $listen = [
'Illuminate\Mail\Events\MessageSent' => [
'App\Listeners\LogSentMessage',
],
\App\Events\ProviderPaymentCreated::class => [
ProviderPaymentCreated::class,
],
];
/**
* Register any events for your application.
*
* @return void
*/
public function boot()
{
parent::boot();
}
}

View File

@ -1,63 +0,0 @@
<?php
namespace App\Providers;
use Illuminate\Cache\RateLimiting\Limit;
use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\RateLimiter;
use Illuminate\Support\Facades\Route;
class RouteServiceProvider extends ServiceProvider
{
/**
* The path to the "home" route for your application.
*
* This is used by Laravel authentication to redirect users after login.
*
* @var string
*/
public const HOME = '/home';
/**
* The controller namespace for the application.
*
* When present, controller route declarations will automatically be prefixed with this namespace.
*
* @var string|null
*/
// protected $namespace = 'App\\Http\\Controllers';
/**
* Define your route model bindings, pattern filters, etc.
*
* @return void
*/
public function boot()
{
$this->configureRateLimiting();
$this->routes(function () {
Route::prefix('api')
->middleware('api')
->namespace($this->namespace)
->group(base_path('routes/api.php'));
Route::middleware('web')
->namespace($this->namespace)
->group(base_path('routes/web.php'));
});
}
/**
* Configure the rate limiters for the application.
*
* @return void
*/
protected function configureRateLimiting()
{
RateLimiter::for('api', function (Request $request) {
return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip());
});
}
}

50
artisan
View File

@ -1,53 +1,15 @@
#!/usr/bin/env php #!/usr/bin/env php
<?php <?php
use Symfony\Component\Console\Input\ArgvInput;
define('LARAVEL_START', microtime(true)); define('LARAVEL_START', microtime(true));
/* // Register the Composer autoloader...
|--------------------------------------------------------------------------
| Register The Auto Loader
|--------------------------------------------------------------------------
|
| Composer provides a convenient, automatically generated class loader
| for our application. We just need to utilize it! We'll require it
| into the script here so that we do not have to worry about the
| loading of any of our classes manually. It's great to relax.
|
*/
require __DIR__.'/vendor/autoload.php'; require __DIR__.'/vendor/autoload.php';
$app = require_once __DIR__.'/bootstrap/app.php'; // Bootstrap Laravel and handle the command...
$status = (require_once __DIR__.'/bootstrap/app.php')
/* ->handleCommand(new ArgvInput);
|--------------------------------------------------------------------------
| Run The Artisan Application
|--------------------------------------------------------------------------
|
| When we run the console application, the current CLI command will be
| executed in this console and the response sent back to a terminal
| or another output device for the developers. Here goes nothing!
|
*/
$kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
$status = $kernel->handle(
$input = new Symfony\Component\Console\Input\ArgvInput,
new Symfony\Component\Console\Output\ConsoleOutput
);
/*
|--------------------------------------------------------------------------
| Shutdown The Application
|--------------------------------------------------------------------------
|
| Once Artisan has finished running, we will fire off the shutdown events
| so that any final work may be done by the application before we shut
| down the process. This is the last thing to happen to the request.
|
*/
$kernel->terminate($input, $status);
exit($status); exit($status);

View File

@ -1,55 +1,24 @@
<?php <?php
/* use Illuminate\Foundation\Application;
|-------------------------------------------------------------------------- use Illuminate\Foundation\Configuration\Exceptions;
| Create The Application use Illuminate\Foundation\Configuration\Middleware;
|--------------------------------------------------------------------------
|
| The first thing we will do is create a new Laravel application instance
| which serves as the "glue" for all the components of Laravel, and is
| the IoC container for the system binding all of the various parts.
|
*/
$app = new Illuminate\Foundation\Application( return Application::configure(basePath: dirname(__DIR__))
realpath(__DIR__.'/../') ->withRouting(
); web: __DIR__.'/../routes/web.php',
commands: __DIR__.'/../routes/console.php',
health: '/up',
)
->withMiddleware(function (Middleware $middleware) {
$middleware->append([
\App\Http\Middleware\SetSite::class,
]);
/* $middleware->alias([
|-------------------------------------------------------------------------- 'role' => \App\Http\Middleware\Role::class,
| Bind Important Interfaces ]);
|-------------------------------------------------------------------------- })
| ->withExceptions(function (Exceptions $exceptions) {
| Next, we need to bind some important interfaces into the container so //
| we will be able to resolve them when needed. The kernels serve the })->create();
| incoming requests to this application from both the web and CLI.
|
*/
$app->singleton(
Illuminate\Contracts\Http\Kernel::class,
App\Http\Kernel::class
);
$app->singleton(
Illuminate\Contracts\Console\Kernel::class,
App\Console\Kernel::class
);
$app->singleton(
Illuminate\Contracts\Debug\ExceptionHandler::class,
App\Exceptions\Handler::class
);
/*
|--------------------------------------------------------------------------
| Return The Application
|--------------------------------------------------------------------------
|
| This script returns the application instance. The instance is given to
| the calling script so we can separate the building of the instances
| from the actual running of the application and sending responses.
|
*/
return $app;

5
bootstrap/providers.php Normal file
View File

@ -0,0 +1,5 @@
<?php
return [
App\Providers\AppServiceProvider::class,
];

View File

@ -2,43 +2,32 @@
"name": "laravel/laravel", "name": "laravel/laravel",
"type": "project", "type": "project",
"description": "The Laravel Framework.", "description": "The Laravel Framework.",
"keywords": [ "framework", "laravel" ], "keywords": ["laravel", "framework"],
"license": "MIT", "license": "MIT",
"require": { "require": {
"php": "^8.0.2", "php": "^8.2|8.3",
"ext-curl": "*", "ext-curl": "*",
"ext-pdo": "*", "ext-pdo": "*",
"ext-zlib": "*",
"awobaz/compoships": "^2.1",
"barryvdh/laravel-snappy": "^1.0", "barryvdh/laravel-snappy": "^1.0",
"clarkeash/doorman": "^7.0",
"doctrine/dbal": "^2.10",
"eduardokum/laravel-mail-auto-embed": "^2.0", "eduardokum/laravel-mail-auto-embed": "^2.0",
"fruitcake/laravel-cors": "^2.0",
"guzzlehttp/guzzle": "^7.0.1",
"intervention/image": "^2.5",
"laravel/framework": "^9.0",
"laravel/passport": "^10.1",
"laravel/socialite": "^5.2",
"laravel/ui": "^3.2",
"laravel/dreamscape": "^0.1.0", "laravel/dreamscape": "^0.1.0",
"laravel/framework": "^11.0",
"laravel/intuit": "^0.1.7", "laravel/intuit": "^0.1.7",
"laravel/leenooks": "^9.2.6", "laravel/leenooks": "^11.0",
"leenooks/laravel-theme": "^v2.0.18", "laravel/passport": "^12.0",
"nunomaduro/laravel-console-summary": "^1.8", "laravel/socialite": "^5.15",
"laravel/ui": "^4.5",
"paypal/paypal-checkout-sdk": "^1.0", "paypal/paypal-checkout-sdk": "^1.0",
"rennokki/laravel-eloquent-query-cache": "^3.3", "repat/laravel-job-models": "^0.9",
"repat/laravel-job-models": "^0.7",
"romanzipp/laravel-queue-monitor": "^2.0",
"web-auth/webauthn-lib": "^4.4" "web-auth/webauthn-lib": "^4.4"
}, },
"require-dev": { "require-dev": {
"barryvdh/laravel-debugbar": "^3.6", "barryvdh/laravel-debugbar": "^3.6",
"spatie/laravel-ignition": "^1.0", "fakerphp/faker": "^1.23",
"fakerphp/faker": "^1.9.1", "mockery/mockery": "^1.6",
"mockery/mockery": "^1.4.2", "nunomaduro/collision": "^8.0",
"nunomaduro/collision": "^6.1", "phpunit/phpunit": "^11.0.1",
"phpunit/phpunit": "^9.3.3" "spatie/laravel-ignition": "^2.4"
}, },
"autoload": { "autoload": {
"psr-4": { "psr-4": {
@ -68,10 +57,6 @@
"type": "vcs", "type": "vcs",
"url": "https://gitea.dege.au/laravel/dreamscape.git" "url": "https://gitea.dege.au/laravel/dreamscape.git"
}, },
"laravel-theme": {
"type": "vcs",
"url": "https://github.com/leenooks/laravel-theme"
},
"laravel-console-summary": { "laravel-console-summary": {
"type": "vcs", "type": "vcs",
"url": "https://github.com/leenooks/laravel-console-summary" "url": "https://github.com/leenooks/laravel-console-summary"
@ -99,6 +84,6 @@
"preferred-install": "dist", "preferred-install": "dist",
"sort-packages": true "sort-packages": true
}, },
"minimum-stability": "dev", "minimum-stability": "stable",
"prefer-stable": true "prefer-stable": true
} }

3031
composer.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -7,9 +7,9 @@ return [
| Application Name | Application Name
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| This value is the name of your application. This value is used when the | This value is the name of your application, which will be used when the
| framework needs to place the application's name in a notification or | framework needs to place the application's name in a notification or
| any other location as required by the application or its packages. | other UI elements where an application name needs to be displayed.
| |
*/ */
@ -50,26 +50,24 @@ return [
| |
| This URL is used by the console to properly generate URLs when using | This URL is used by the console to properly generate URLs when using
| the Artisan command line tool. You should set this to the root of | the Artisan command line tool. You should set this to the root of
| your application so that it is used when running Artisan tasks. | the application so that it's available within Artisan commands.
| |
*/ */
'url' => env('APP_URL', 'http://localhost'), 'url' => env('APP_URL', 'http://localhost'),
'asset_url' => env('ASSET_URL', null),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Application Timezone | Application Timezone
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Here you may specify the default timezone for your application, which | Here you may specify the default timezone for your application, which
| will be used by the PHP date and date-time functions. We have gone | will be used by the PHP date and date-time functions. The timezone
| ahead and set this to a sensible default for you out of the box. | is set to "UTC" by default as it is suitable for most use cases.
| |
*/ */
'timezone' => 'Australia/Melbourne', 'timezone' => env('APP_TIMEZONE', 'UTC'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -77,173 +75,54 @@ return [
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| The application locale determines the default locale that will be used | The application locale determines the default locale that will be used
| by the translation service provider. You are free to set this value | by Laravel's translation / localization methods. This option can be
| to any of the locales which will be supported by the application. | set to any locale for which you plan to have translation strings.
| |
*/ */
'locale' => 'en', 'locale' => env('APP_LOCALE', 'en'),
/* 'fallback_locale' => env('APP_FALLBACK_LOCALE', 'en'),
|--------------------------------------------------------------------------
| Application Fallback Locale
|--------------------------------------------------------------------------
|
| The fallback locale determines the locale to use when the current one
| is not available. You may change the value to correspond to any of
| the language folders that are provided through your application.
|
*/
'fallback_locale' => 'en', 'faker_locale' => env('APP_FAKER_LOCALE', 'en_US'),
/*
|--------------------------------------------------------------------------
| Faker Locale
|--------------------------------------------------------------------------
|
| This locale will be used by the Faker PHP library when generating fake
| data for your database seeds. For example, this will be used to get
| localized telephone numbers, street address information and more.
|
*/
'faker_locale' => 'en_US',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Encryption Key | Encryption Key
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| This key is used by the Illuminate encrypter service and should be set | This key is utilized by Laravel's encryption services and should be set
| to a random, 32 character string, otherwise these encrypted strings | to a random, 32 character string to ensure that all encrypted values
| will not be safe. Please do this before deploying an application! | are secure. You should do this prior to deploying the application.
| |
*/ */
'key' => env('APP_KEY'),
'cipher' => 'AES-256-CBC', 'cipher' => 'AES-256-CBC',
/* 'key' => env('APP_KEY'),
|--------------------------------------------------------------------------
| Autoloaded Service Providers
|--------------------------------------------------------------------------
|
| The service providers listed here will be automatically loaded on the
| request to your application. Feel free to add your own services to
| this array to grant expanded functionality to your applications.
|
*/
'providers' => [ 'previous_keys' => [
...array_filter(
/* explode(',', env('APP_PREVIOUS_KEYS', ''))
* Laravel Framework Service Providers... ),
*/
Illuminate\Auth\AuthServiceProvider::class,
Illuminate\Broadcasting\BroadcastServiceProvider::class,
Illuminate\Bus\BusServiceProvider::class,
Illuminate\Cache\CacheServiceProvider::class,
Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
Illuminate\Cookie\CookieServiceProvider::class,
Illuminate\Database\DatabaseServiceProvider::class,
Illuminate\Encryption\EncryptionServiceProvider::class,
Illuminate\Filesystem\FilesystemServiceProvider::class,
Illuminate\Foundation\Providers\FoundationServiceProvider::class,
Illuminate\Hashing\HashServiceProvider::class,
Illuminate\Mail\MailServiceProvider::class,
Illuminate\Notifications\NotificationServiceProvider::class,
Illuminate\Pagination\PaginationServiceProvider::class,
Illuminate\Pipeline\PipelineServiceProvider::class,
Illuminate\Queue\QueueServiceProvider::class,
Illuminate\Redis\RedisServiceProvider::class,
Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
Illuminate\Session\SessionServiceProvider::class,
Illuminate\Translation\TranslationServiceProvider::class,
Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,
/*
* Package Service Providers...
*/
/*
* Application Service Providers...
*/
App\Providers\AppServiceProvider::class,
App\Providers\AuthServiceProvider::class,
// App\Providers\BroadcastServiceProvider::class,
App\Providers\EventServiceProvider::class,
App\Providers\RouteServiceProvider::class,
Laravel\Socialite\SocialiteServiceProvider::class,
/*
* Other Service Providers...
*/
Orchestra\Asset\AssetServiceProvider::class,
Collective\Html\HtmlServiceProvider::class,
], ],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Class Aliases | Maintenance Mode Driver
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| This array of class aliases will be registered when this application | These configuration options determine the driver used to determine and
| is started. However, feel free to register as many as you wish as | manage Laravel's "maintenance mode" status. The "cache" driver will
| the aliases are "lazy" loaded so they don't hinder performance. | allow maintenance mode to be controlled across multiple machines.
|
| Supported drivers: "file", "cache"
| |
*/ */
'aliases' => [ 'maintenance' => [
'driver' => env('APP_MAINTENANCE_DRIVER', 'file'),
'App' => Illuminate\Support\Facades\App::class, 'store' => env('APP_MAINTENANCE_STORE', 'database'),
'Arr' => Illuminate\Support\Arr::class,
'Artisan' => Illuminate\Support\Facades\Artisan::class,
'Asset' => Orchestra\Support\Facades\Asset::class,
'Auth' => Illuminate\Support\Facades\Auth::class,
'Blade' => Illuminate\Support\Facades\Blade::class,
'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
'Bus' => Illuminate\Support\Facades\Bus::class,
'Cache' => Illuminate\Support\Facades\Cache::class,
'Config' => Illuminate\Support\Facades\Config::class,
'Cookie' => Illuminate\Support\Facades\Cookie::class,
'Crypt' => Illuminate\Support\Facades\Crypt::class,
'Date' => Illuminate\Support\Facades\Date::class,
'DB' => Illuminate\Support\Facades\DB::class,
'Eloquent' => Illuminate\Database\Eloquent\Model::class,
'Event' => Illuminate\Support\Facades\Event::class,
'File' => Illuminate\Support\Facades\File::class,
'Gate' => Illuminate\Support\Facades\Gate::class,
'Gravatar' => Creativeorange\Gravatar\Facades\Gravatar::class,
'Hash' => Illuminate\Support\Facades\Hash::class,
'Http' => Illuminate\Support\Facades\Http::class,
'Lang' => Illuminate\Support\Facades\Lang::class,
'Log' => Illuminate\Support\Facades\Log::class,
'Mail' => Illuminate\Support\Facades\Mail::class,
'Notification' => Illuminate\Support\Facades\Notification::class,
'Password' => Illuminate\Support\Facades\Password::class,
'PDF' => Barryvdh\Snappy\Facades\SnappyPdf::class,
'Queue' => Illuminate\Support\Facades\Queue::class,
'RateLimiter' => Illuminate\Support\Facades\RateLimiter::class,
'Redirect' => Illuminate\Support\Facades\Redirect::class,
'Redis' => Illuminate\Support\Facades\Redis::class,
'Request' => Illuminate\Support\Facades\Request::class,
'Response' => Illuminate\Support\Facades\Response::class,
'Route' => Illuminate\Support\Facades\Route::class,
'Schema' => Illuminate\Support\Facades\Schema::class,
'Session' => Illuminate\Support\Facades\Session::class,
'Storage' => Illuminate\Support\Facades\Storage::class,
'Str' => Illuminate\Support\Str::class,
'URL' => Illuminate\Support\Facades\URL::class,
'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class,
], ],
// @todo This needs to move.
'invoice_inadvance'=>30,
'font' => 'Noto Sans TC',
]; ];

View File

@ -7,15 +7,15 @@ return [
| Authentication Defaults | Authentication Defaults
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| This option controls the default authentication "guard" and password | This option defines the default authentication "guard" and password
| reset options for your application. You may change these defaults | reset "broker" for your application. You may change these values
| as required, but they're a perfect start for most applications. | as required, but they're a perfect start for most applications.
| |
*/ */
'defaults' => [ 'defaults' => [
'guard' => 'web', 'guard' => env('AUTH_GUARD', 'web'),
'passwords' => 'users', 'passwords' => env('AUTH_PASSWORD_BROKER', 'users'),
], ],
/* /*
@ -25,13 +25,13 @@ return [
| |
| Next, you may define every authentication guard for your application. | Next, you may define every authentication guard for your application.
| Of course, a great default configuration has been defined for you | Of course, a great default configuration has been defined for you
| here which uses session storage and the Eloquent user provider. | which utilizes session storage plus the Eloquent user provider.
| |
| All authentication drivers have a user provider. This defines how the | All authentication guards have a user provider, which defines how the
| users are actually retrieved out of your database or other storage | users are actually retrieved out of your database or other storage
| mechanisms used by this application to persist your user's data. | system used by the application. Typically, Eloquent is utilized.
| |
| Supported: "session", "token" | Supported: "session"
| |
*/ */
@ -40,11 +40,6 @@ return [
'driver' => 'session', 'driver' => 'session',
'provider' => 'users', 'provider' => 'users',
], ],
'api' => [
'driver' => 'passport',
'provider' => 'users',
],
], ],
/* /*
@ -52,12 +47,12 @@ return [
| User Providers | User Providers
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| All authentication drivers have a user provider. This defines how the | All authentication guards have a user provider, which defines how the
| users are actually retrieved out of your database or other storage | users are actually retrieved out of your database or other storage
| mechanisms used by this application to persist your user's data. | system used by the application. Typically, Eloquent is utilized.
| |
| If you have multiple user tables or models you may configure multiple | If you have multiple user tables or models you may configure multiple
| sources which represent each model / table. These sources may then | providers to represent the model / table. These providers may then
| be assigned to any extra authentication guards you have defined. | be assigned to any extra authentication guards you have defined.
| |
| Supported: "database", "eloquent" | Supported: "database", "eloquent"
@ -67,7 +62,7 @@ return [
'providers' => [ 'providers' => [
'users' => [ 'users' => [
'driver' => 'eloquent', 'driver' => 'eloquent',
'model' => App\Models\User::class, 'model' => env('AUTH_MODEL', App\Models\User::class),
], ],
// 'users' => [ // 'users' => [
@ -81,30 +76,40 @@ return [
| Resetting Passwords | Resetting Passwords
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| You may specify multiple password reset configurations if you have more | These configuration options specify the behavior of Laravel's password
| than one user table or model in the application and you want to have | reset functionality, including the table utilized for token storage
| separate password reset settings based on the specific user types. | and the user provider that is invoked to actually retrieve users.
| |
| The expire time is the number of minutes that the reset token should be | The expiry time is the number of minutes that each reset token will be
| considered valid. This security feature keeps tokens short-lived so | considered valid. This security feature keeps tokens short-lived so
| they have less time to be guessed. You may change this as needed. | they have less time to be guessed. You may change this as needed.
| |
| The throttle setting is the number of seconds a user must wait before
| generating more password reset tokens. This prevents the user from
| quickly generating a very large amount of password reset tokens.
|
*/ */
'passwords' => [ 'passwords' => [
'users' => [ 'users' => [
'provider' => 'users', 'provider' => 'users',
'table' => 'password_resets', 'table' => env('AUTH_PASSWORD_RESET_TOKEN_TABLE', 'password_reset_tokens'),
'expire' => 60, 'expire' => 60,
'throttle' => 60,
], ],
], ],
'social' => [ /*
'google' => [ |--------------------------------------------------------------------------
'name' => 'Google', | Password Confirmation Timeout
'id' => 'google', |--------------------------------------------------------------------------
'class' => 'btn-danger', |
'icon' => 'fab fa-google', | Here you may define the amount of seconds before a password confirmation
], | window expires and users are asked to re-enter their password via the
], | confirmation screen. By default, the timeout lasts for three hours.
|
*/
'password_timeout' => env('AUTH_PASSWORD_TIMEOUT', 10800),
]; ];

View File

@ -1,59 +0,0 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Default Broadcaster
|--------------------------------------------------------------------------
|
| This option controls the default broadcaster that will be used by the
| framework when an event needs to be broadcast. You may set this to
| any of the connections defined in the "connections" array below.
|
| Supported: "pusher", "redis", "log", "null"
|
*/
'default' => env('BROADCAST_DRIVER', 'null'),
/*
|--------------------------------------------------------------------------
| Broadcast Connections
|--------------------------------------------------------------------------
|
| Here you may define all of the broadcast connections that will be used
| to broadcast events to other systems or over websockets. Samples of
| each available type of connection are provided inside this array.
|
*/
'connections' => [
'pusher' => [
'driver' => 'pusher',
'key' => env('PUSHER_APP_KEY'),
'secret' => env('PUSHER_APP_SECRET'),
'app_id' => env('PUSHER_APP_ID'),
'options' => [
'cluster' => env('PUSHER_APP_CLUSTER'),
'useTLS' => true,
],
],
'redis' => [
'driver' => 'redis',
'connection' => 'default',
],
'log' => [
'driver' => 'log',
],
'null' => [
'driver' => 'null',
],
],
];

View File

@ -9,16 +9,13 @@ return [
| Default Cache Store | Default Cache Store
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| This option controls the default cache connection that gets used while | This option controls the default cache store that will be used by the
| using this caching library. This connection is used when another is | framework. This connection is utilized if another isn't explicitly
| not explicitly specified when executing a given caching function. | specified when running a cache operation inside the application.
|
| Supported: "apc", "array", "database", "file",
| "memcached", "redis", "dynamodb"
| |
*/ */
'default' => env('CACHE_DRIVER', 'file'), 'default' => env('CACHE_STORE', 'database'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -29,27 +26,30 @@ return [
| well as their drivers. You may even define multiple stores for the | well as their drivers. You may even define multiple stores for the
| same cache driver to group types of items stored in your caches. | same cache driver to group types of items stored in your caches.
| |
| Supported drivers: "array", "database", "file", "memcached",
| "redis", "dynamodb", "octane", "null"
|
*/ */
'stores' => [ 'stores' => [
'apc' => [
'driver' => 'apc',
],
'array' => [ 'array' => [
'driver' => 'array', 'driver' => 'array',
'serialize' => false,
], ],
'database' => [ 'database' => [
'driver' => 'database', 'driver' => 'database',
'table' => 'cache', 'connection' => env('DB_CACHE_CONNECTION'),
'connection' => null, 'table' => env('DB_CACHE_TABLE', 'cache'),
'lock_connection' => env('DB_CACHE_LOCK_CONNECTION'),
'lock_table' => env('DB_CACHE_LOCK_TABLE'),
], ],
'file' => [ 'file' => [
'driver' => 'file', 'driver' => 'file',
'path' => storage_path('framework/cache/data'), 'path' => storage_path('framework/cache/data'),
'lock_path' => storage_path('framework/cache/data'),
], ],
'memcached' => [ 'memcached' => [
@ -73,7 +73,8 @@ return [
'redis' => [ 'redis' => [
'driver' => 'redis', 'driver' => 'redis',
'connection' => 'cache', 'connection' => env('REDIS_CACHE_CONNECTION', 'cache'),
'lock_connection' => env('REDIS_CACHE_LOCK_CONNECTION', 'default'),
], ],
'dynamodb' => [ 'dynamodb' => [
@ -85,6 +86,10 @@ return [
'endpoint' => env('DYNAMODB_ENDPOINT'), 'endpoint' => env('DYNAMODB_ENDPOINT'),
], ],
'octane' => [
'driver' => 'octane',
],
], ],
/* /*
@ -92,12 +97,12 @@ return [
| Cache Key Prefix | Cache Key Prefix
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| When utilizing a RAM based store such as APC or Memcached, there might | When utilizing the APC, database, memcached, Redis, and DynamoDB cache
| be other applications utilizing the same cache. So, we'll specify a | stores, there might be other applications using the same cache. For
| value to get prefixed to all our keys so we can avoid collisions. | that reason, you may prefix every cache key to avoid collisions.
| |
*/ */
'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'), 'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache_'),
]; ];

View File

@ -1,34 +0,0 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Cross-Origin Resource Sharing (CORS) Configuration
|--------------------------------------------------------------------------
|
| Here you may configure your settings for cross-origin resource sharing
| or "CORS". This determines what cross-origin operations may execute
| in web browsers. You are free to adjust these settings as needed.
|
| To learn more: https://developer.mozilla.org/en-US/docs/Web/HTTP/CORS
|
*/
'paths' => ['api/*', 'sanctum/csrf-cookie'],
'allowed_methods' => ['*'],
'allowed_origins' => ['*'],
'allowed_origins_patterns' => [],
'allowed_headers' => ['*'],
'exposed_headers' => [],
'max_age' => 0,
'supports_credentials' => false,
];

View File

@ -10,26 +10,22 @@ return [
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Here you may specify which of the database connections below you wish | Here you may specify which of the database connections below you wish
| to use as your default connection for all database work. Of course | to use as your default connection for database operations. This is
| you may use many connections at once using the Database library. | the connection which will be utilized unless another connection
| is explicitly specified when you execute a query / statement.
| |
*/ */
'default' => env('DB_CONNECTION', 'mysql'), 'default' => env('DB_CONNECTION', 'sqlite'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Database Connections | Database Connections
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Here are each of the database connections setup for your application. | Below are all of the database connections defined for your application.
| Of course, examples of configuring each database platform that is | An example configuration is provided for each database system which
| supported by Laravel is shown below to make development simple. | is supported by Laravel. You're free to add / remove connections.
|
|
| All database work in Laravel is done through the PHP PDO facilities
| so make sure you have the driver for your particular database of
| choice installed on your machine before you begin development.
| |
*/ */
@ -37,7 +33,7 @@ return [
'sqlite' => [ 'sqlite' => [
'driver' => 'sqlite', 'driver' => 'sqlite',
'url' => env('DATABASE_URL'), 'url' => env('DB_URL'),
'database' => env('DB_DATABASE', database_path('database.sqlite')), 'database' => env('DB_DATABASE', database_path('database.sqlite')),
'prefix' => '', 'prefix' => '',
'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true), 'foreign_key_constraints' => env('DB_FOREIGN_KEYS', true),
@ -45,15 +41,35 @@ return [
'mysql' => [ 'mysql' => [
'driver' => 'mysql', 'driver' => 'mysql',
'url' => env('DATABASE_URL'), 'url' => env('DB_URL'),
'host' => env('DB_HOST', '127.0.0.1'), 'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '3306'), 'port' => env('DB_PORT', '3306'),
'database' => env('DB_DATABASE', 'forge'), 'database' => env('DB_DATABASE', 'laravel'),
'username' => env('DB_USERNAME', 'forge'), 'username' => env('DB_USERNAME', 'root'),
'password' => env('DB_PASSWORD', ''), 'password' => env('DB_PASSWORD', ''),
'unix_socket' => env('DB_SOCKET', ''), 'unix_socket' => env('DB_SOCKET', ''),
'charset' => 'utf8mb4', 'charset' => env('DB_CHARSET', 'utf8mb4'),
'collation' => 'utf8mb4_unicode_ci', 'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'),
'prefix' => '',
'prefix_indexes' => true,
'strict' => true,
'engine' => null,
'options' => extension_loaded('pdo_mysql') ? array_filter([
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
]) : [],
],
'mariadb' => [
'driver' => 'mariadb',
'url' => env('DB_URL'),
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '3306'),
'database' => env('DB_DATABASE', 'laravel'),
'username' => env('DB_USERNAME', 'root'),
'password' => env('DB_PASSWORD', ''),
'unix_socket' => env('DB_SOCKET', ''),
'charset' => env('DB_CHARSET', 'utf8mb4'),
'collation' => env('DB_COLLATION', 'utf8mb4_unicode_ci'),
'prefix' => '', 'prefix' => '',
'prefix_indexes' => true, 'prefix_indexes' => true,
'strict' => true, 'strict' => true,
@ -65,30 +81,32 @@ return [
'pgsql' => [ 'pgsql' => [
'driver' => 'pgsql', 'driver' => 'pgsql',
'url' => env('DATABASE_URL'), 'url' => env('DB_URL'),
'host' => env('DB_HOST', '127.0.0.1'), 'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '5432'), 'port' => env('DB_PORT', '5432'),
'database' => env('DB_DATABASE', 'forge'), 'database' => env('DB_DATABASE', 'laravel'),
'username' => env('DB_USERNAME', 'forge'), 'username' => env('DB_USERNAME', 'root'),
'password' => env('DB_PASSWORD', ''), 'password' => env('DB_PASSWORD', ''),
'charset' => 'utf8', 'charset' => env('DB_CHARSET', 'utf8'),
'prefix' => '', 'prefix' => '',
'prefix_indexes' => true, 'prefix_indexes' => true,
'schema' => env('DB_SCHEMA', 'public'), 'search_path' => env('DB_SCHEMA', 'public'),
'sslmode' => 'prefer', 'sslmode' => 'prefer',
], ],
'sqlsrv' => [ 'sqlsrv' => [
'driver' => 'sqlsrv', 'driver' => 'sqlsrv',
'url' => env('DATABASE_URL'), 'url' => env('DB_URL'),
'host' => env('DB_HOST', 'localhost'), 'host' => env('DB_HOST', 'localhost'),
'port' => env('DB_PORT', '1433'), 'port' => env('DB_PORT', '1433'),
'database' => env('DB_DATABASE', 'forge'), 'database' => env('DB_DATABASE', 'laravel'),
'username' => env('DB_USERNAME', 'forge'), 'username' => env('DB_USERNAME', 'root'),
'password' => env('DB_PASSWORD', ''), 'password' => env('DB_PASSWORD', ''),
'charset' => 'utf8', 'charset' => env('DB_CHARSET', 'utf8'),
'prefix' => '', 'prefix' => '',
'prefix_indexes' => true, 'prefix_indexes' => true,
// 'encrypt' => env('DB_ENCRYPT', 'yes'),
// 'trust_server_certificate' => env('DB_TRUST_SERVER_CERTIFICATE', 'false'),
], ],
], ],
@ -100,11 +118,14 @@ return [
| |
| This table keeps track of all the migrations that have already run for | This table keeps track of all the migrations that have already run for
| your application. Using this information, we can determine which of | your application. Using this information, we can determine which of
| the migrations on disk haven't actually been run in the database. | the migrations on disk haven't actually been run on the database.
| |
*/ */
'migrations' => 'migrations', 'migrations' => [
'table' => 'migrations',
'update_date_on_publish' => true,
],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -113,7 +134,7 @@ return [
| |
| Redis is an open source, fast, and advanced key-value store that also | Redis is an open source, fast, and advanced key-value store that also
| provides a richer body of commands than a typical key-value system | provides a richer body of commands than a typical key-value system
| such as APC or Memcached. Laravel makes it easy to dig right in. | such as Memcached. You may define your connection settings here.
| |
*/ */
@ -129,17 +150,19 @@ return [
'default' => [ 'default' => [
'url' => env('REDIS_URL'), 'url' => env('REDIS_URL'),
'host' => env('REDIS_HOST', '127.0.0.1'), 'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => env('REDIS_PASSWORD', null), 'username' => env('REDIS_USERNAME'),
'port' => env('REDIS_PORT', 6379), 'password' => env('REDIS_PASSWORD'),
'database' => env('REDIS_DB', 0), 'port' => env('REDIS_PORT', '6379'),
'database' => env('REDIS_DB', '0'),
], ],
'cache' => [ 'cache' => [
'url' => env('REDIS_URL'), 'url' => env('REDIS_URL'),
'host' => env('REDIS_HOST', '127.0.0.1'), 'host' => env('REDIS_HOST', '127.0.0.1'),
'password' => env('REDIS_PASSWORD', null), 'username' => env('REDIS_USERNAME'),
'port' => env('REDIS_PORT', 6379), 'password' => env('REDIS_PASSWORD'),
'database' => env('REDIS_CACHE_DB', 1), 'port' => env('REDIS_PORT', '6379'),
'database' => env('REDIS_CACHE_DB', '1'),
], ],
], ],

View File

@ -1,34 +0,0 @@
<?php
return [
/*
* This is the master switch to enable demo mode.
*/
'enabled' => env('DEMO_MODE_ENABLED', false),
/*
* Visitors browsing a protected url will be redirected to this path.
*/
'redirect_unauthorized_users_to_url' => '/under-construction',
/*
* After having gained access, visitors will be redirected to this path.
*/
'redirect_authorized_users_to_url' => '/',
/*
* The following IP's will automatically gain access to the
* app without having to visit the `demoAccess` route.
*/
'authorized_ips' => [
//
],
/*
* When strict mode is enabled, only IP's listed in `authorized_ips` will gain access.
* Visitors won't be able to gain access by visiting the `demoAccess` route anymore.
*/
'strict_mode' => false,
];

View File

@ -1,65 +0,0 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Invite Table Name
|--------------------------------------------------------------------------
|
*/
'invite_table_name' => 'invites',
/*
|--------------------------------------------------------------------------
| Invite Model Class
|--------------------------------------------------------------------------
|
| This option allows you to override the default model.
| Your model MUST extend the base Invite model.
|
| Default: Clarkeash\Doorman\Models\Invite::class
*/
'invite_model' => Clarkeash\Doorman\Models\Invite::class,
/*
|--------------------------------------------------------------------------
| Default Code Generator
|--------------------------------------------------------------------------
|
| This option controls how the invite codes are generated.
| You should adjust this based on your needs.
|
| Supported: "basic", "uuid"
|
*/
'driver' => env('DOORMAN_DRIVER', 'basic'),
/*
|--------------------------------------------------------------------------
| Driver Configurations
|--------------------------------------------------------------------------
|
| Here are each of the driver configurations for your application.
| You can customize should your application require it.
|
*/
'basic' => [
'length' => 6,
],
/*
|--------------------------------------------------------------------------
| UUID
|--------------------------------------------------------------------------
|
| supported versions: 1,3,4,5
|
| Versions 3 & 5, require 'namespace' and 'name' to be set
|
*/
'uuid' => [
'version' => 4,
],
];

View File

@ -9,35 +9,22 @@ return [
| |
| Here you may specify the default filesystem disk that should be used | Here you may specify the default filesystem disk that should be used
| by the framework. The "local" disk, as well as a variety of cloud | by the framework. The "local" disk, as well as a variety of cloud
| based disks are available to your application. Just store away! | based disks are available to your application for file storage.
| |
*/ */
'default' => env('FILESYSTEM_DRIVER', 'local'), 'default' => env('FILESYSTEM_DISK', 'local'),
/*
|--------------------------------------------------------------------------
| Default Cloud Filesystem Disk
|--------------------------------------------------------------------------
|
| Many applications store files both locally and in the cloud. For this
| reason, you may specify a default "cloud" driver here. This driver
| will be bound as the Cloud disk implementation in the container.
|
*/
'cloud' => env('FILESYSTEM_CLOUD', 's3'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Filesystem Disks | Filesystem Disks
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Here you may configure as many filesystem "disks" as you wish, and you | Below you may configure as many filesystem disks as necessary, and you
| may even configure multiple disks of the same driver. Defaults have | may even configure multiple disks for the same driver. Examples for
| been setup for each driver as an example of the required options. | most supported storage drivers are configured here for reference.
| |
| Supported Drivers: "local", "ftp", "sftp", "s3" | Supported drivers: "local", "ftp", "sftp", "s3"
| |
*/ */
@ -46,6 +33,7 @@ return [
'local' => [ 'local' => [
'driver' => 'local', 'driver' => 'local',
'root' => storage_path('app'), 'root' => storage_path('app'),
'throw' => false,
], ],
'public' => [ 'public' => [
@ -53,6 +41,7 @@ return [
'root' => storage_path('app/public'), 'root' => storage_path('app/public'),
'url' => env('APP_URL').'/storage', 'url' => env('APP_URL').'/storage',
'visibility' => 'public', 'visibility' => 'public',
'throw' => false,
], ],
's3' => [ 's3' => [
@ -62,8 +51,26 @@ return [
'region' => env('AWS_DEFAULT_REGION'), 'region' => env('AWS_DEFAULT_REGION'),
'bucket' => env('AWS_BUCKET'), 'bucket' => env('AWS_BUCKET'),
'url' => env('AWS_URL'), 'url' => env('AWS_URL'),
'endpoint' => env('AWS_ENDPOINT'),
'use_path_style_endpoint' => env('AWS_USE_PATH_STYLE_ENDPOINT', false),
'throw' => false,
], ],
], ],
/*
|--------------------------------------------------------------------------
| Symbolic Links
|--------------------------------------------------------------------------
|
| Here you may configure the symbolic links that will be created when the
| `storage:link` Artisan command is executed. The array keys should be
| the locations of the links and the values should be their targets.
|
*/
'links' => [
public_path('storage') => storage_path('app/public'),
],
]; ];

View File

@ -1,34 +0,0 @@
<?php
return array(
'default' => array(
// By default, images are presented at 80px by 80px if no size parameter is supplied.
// You may request a specific image size, which will be dynamically delivered from Gravatar
// by passing a single pixel dimension (since the images are square):
'size' => 80,
// the fallback image, can be a string or a url
// for more info, visit: http://en.gravatar.com/site/implement/images/#default-image
'fallback' => 'mm',
// would you like to return a https://... image
'secure' => true,
// Gravatar allows users to self-rate their images so that they can indicate if an image
// is appropriate for a certain audience. By default, only 'G' rated images are displayed
// unless you indicate that you would like to see higher ratings.
// Available options:
// g: suitable for display on all websites with any audience type.
// pg: may contain rude gestures, provocatively dressed individuals, the lesser swear words, or mild violence.
// r: may contain such things as harsh profanity, intense violence, nudity, or hard drug use.
// x: may contain hardcore sexual imagery or extremely disturbing violence.
'maximumRating' => 'g',
// If for some reason you wanted to force the default image to always load, you can do that setting this to true
'forceDefault' => false,
// If you require a file-type extension (some places do) then you may also add an (optional) .jpg extension to that URL
'forceExtension' => 'jpg',
)
);

View File

@ -1,52 +0,0 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Default Hash Driver
|--------------------------------------------------------------------------
|
| This option controls the default hash driver that will be used to hash
| passwords for your application. By default, the bcrypt algorithm is
| used; however, you remain free to modify this option if you wish.
|
| Supported: "bcrypt", "argon", "argon2id"
|
*/
'driver' => 'bcrypt',
/*
|--------------------------------------------------------------------------
| Bcrypt Options
|--------------------------------------------------------------------------
|
| Here you may specify the configuration options that should be used when
| passwords are hashed using the Bcrypt algorithm. This will allow you
| to control the amount of time it takes to hash the given password.
|
*/
'bcrypt' => [
'rounds' => env('BCRYPT_ROUNDS', 10),
],
/*
|--------------------------------------------------------------------------
| Argon Options
|--------------------------------------------------------------------------
|
| Here you may specify the configuration options that should be used when
| passwords are hashed using the Argon algorithm. These will allow you
| to control the amount of time it takes to hash the given password.
|
*/
'argon' => [
'memory' => 1024,
'threads' => 2,
'time' => 2,
],
];

View File

@ -1,177 +0,0 @@
<?php
/*
* This file is part of jwt-auth.
*
* (c) Sean Tymon <tymon148@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
return [
/*
|--------------------------------------------------------------------------
| JWT Authentication Secret
|--------------------------------------------------------------------------
|
| Don't forget to set this, as it will be used to sign your tokens.
| A helper command is provided for this: `php artisan jwt:generate`
|
*/
'secret' => env('JWT_SECRET',
(file_exists(base_path('.jwt.'.env('APP_ENV').'.crt'))
? file_get_contents(base_path('.jwt.'.env('APP_ENV').'.crt'))
: 'changeme')
),
/*
|--------------------------------------------------------------------------
| JWT time to live
|--------------------------------------------------------------------------
|
| Specify the length of time (in minutes) that the token will be valid for.
| Defaults to 1 hour
|
*/
'ttl' => 60,
/*
|--------------------------------------------------------------------------
| Refresh time to live
|--------------------------------------------------------------------------
|
| Specify the length of time (in minutes) that the token can be refreshed
| within. I.E. The user can refresh their token within a 2 week window of
| the original token being created until they must re-authenticate.
| Defaults to 2 weeks
|
*/
'refresh_ttl' => 20160,
/*
|--------------------------------------------------------------------------
| JWT hashing algorithm
|--------------------------------------------------------------------------
|
| Specify the hashing algorithm that will be used to sign the token.
|
| See here: https://github.com/namshi/jose/tree/2.2.0/src/Namshi/JOSE/Signer
| for possible values
|
*/
'algo' => 'RS256',
/*
|--------------------------------------------------------------------------
| User Model namespace
|--------------------------------------------------------------------------
|
| Specify the full namespace to your User model.
| e.g. 'Acme\Entities\User'
|
*/
'user' => \App\Models\User::class,
/*
|--------------------------------------------------------------------------
| User identifier
|--------------------------------------------------------------------------
|
| Specify a unique property of the user that will be added as the 'sub'
| claim of the token payload.
|
*/
'identifier' => 'id',
/*
|--------------------------------------------------------------------------
| Required Claims
|--------------------------------------------------------------------------
|
| Specify the required claims that must exist in any token.
| A TokenInvalidException will be thrown if any of these claims are not
| present in the payload.
|
*/
'required_claims' => ['iss', 'iat', 'exp', 'nbf', 'sub', 'jti'],
/*
|--------------------------------------------------------------------------
| Blacklist Enabled
|--------------------------------------------------------------------------
|
| In order to invalidate tokens, you must have the blacklist enabled.
| If you do not want or need this functionality, then set this to false.
|
*/
'blacklist_enabled' => env('JWT_BLACKLIST_ENABLED', true),
/*
|--------------------------------------------------------------------------
| Providers
|--------------------------------------------------------------------------
|
| Specify the various providers used throughout the package.
|
*/
'providers' => [
/*
|--------------------------------------------------------------------------
| User Provider
|--------------------------------------------------------------------------
|
| Specify the provider that is used to find the user based
| on the subject claim
|
*/
'user' => 'Tymon\JWTAuth\Providers\User\EloquentUserAdapter',
/*
|--------------------------------------------------------------------------
| JWT Provider
|--------------------------------------------------------------------------
|
| Specify the provider that is used to create and decode the tokens.
|
*/
'jwt' => 'Tymon\JWTAuth\Providers\JWT\NamshiAdapter',
/*
|--------------------------------------------------------------------------
| Authentication Provider
|--------------------------------------------------------------------------
|
| Specify the provider that is used to authenticate users.
|
*/
'auth' => 'Tymon\JWTAuth\Providers\Auth\IlluminateAuthAdapter',
/*
|--------------------------------------------------------------------------
| Storage Provider
|--------------------------------------------------------------------------
|
| Specify the provider that is used to store tokens in the blacklist
|
*/
'storage' => 'Tymon\JWTAuth\Providers\Storage\IlluminateCacheAdapter',
],
];

View File

@ -1,50 +0,0 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Hide Commands
|--------------------------------------------------------------------------
|
| This option allows to hide certain commands from the summary output.
| They will still be available in your application. Wildcards are supported
|
| Examples: "make:*", "list"
|
*/
'hide' => [
'cache:*',
'completion',
'config:*',
'db:*',
'debugbar:*',
'event:*',
'ide-helper:*',
'inspire',
'key:generate',
'list',
'make:*',
'migrate:*',
'model:prune',
'notifications:table',
'optimize:*',
'package:discover',
'passport:*',
'queue:*',
'route:*',
'serve',
'schedule:*',
'schema:dump',
'session:table',
'storage:link',
'stub:publish',
'test',
'theme:*',
'ui:*',
'vendor:publish',
'view:*',
],
];

View File

@ -3,6 +3,7 @@
use Monolog\Handler\NullHandler; use Monolog\Handler\NullHandler;
use Monolog\Handler\StreamHandler; use Monolog\Handler\StreamHandler;
use Monolog\Handler\SyslogUdpHandler; use Monolog\Handler\SyslogUdpHandler;
use Monolog\Processor\PsrLogMessageProcessor;
return [ return [
@ -11,33 +12,49 @@ return [
| Default Log Channel | Default Log Channel
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| This option defines the default log channel that gets used when writing | This option defines the default log channel that is utilized to write
| messages to the logs. The name specified in this option should match | messages to your logs. The value provided here should match one of
| one of the channels defined in the "channels" configuration array. | the channels present in the list of "channels" configured below.
| |
*/ */
'default' => env('LOG_CHANNEL', 'stack'), 'default' => env('LOG_CHANNEL', 'stack'),
/*
|--------------------------------------------------------------------------
| Deprecations Log Channel
|--------------------------------------------------------------------------
|
| This option controls the log channel that should be used to log warnings
| regarding deprecated PHP and library features. This allows you to get
| your application ready for upcoming major versions of dependencies.
|
*/
'deprecations' => [
'channel' => env('LOG_DEPRECATIONS_CHANNEL', 'null'),
'trace' => env('LOG_DEPRECATIONS_TRACE', false),
],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Log Channels | Log Channels
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Here you may configure the log channels for your application. Out of | Here you may configure the log channels for your application. Laravel
| the box, Laravel uses the Monolog PHP logging library. This gives | utilizes the Monolog PHP logging library, which includes a variety
| you a variety of powerful log handlers / formatters to utilize. | of powerful log handlers and formatters that you're free to use.
| |
| Available Drivers: "single", "daily", "slack", "syslog", | Available drivers: "single", "daily", "slack", "syslog",
| "errorlog", "monolog", | "errorlog", "monolog", "custom", "stack"
| "custom", "stack"
| |
*/ */
'channels' => [ 'channels' => [
'stack' => [ 'stack' => [
'driver' => 'stack', 'driver' => 'stack',
'channels' => ['daily'], 'channels' => explode(',', env('LOG_STACK', 'single')),
'ignore_exceptions' => false, 'ignore_exceptions' => false,
], ],
@ -45,37 +62,36 @@ return [
'driver' => 'single', 'driver' => 'single',
'path' => storage_path('logs/laravel.log'), 'path' => storage_path('logs/laravel.log'),
'level' => env('LOG_LEVEL', 'debug'), 'level' => env('LOG_LEVEL', 'debug'),
'replace_placeholders' => true,
], ],
'daily' => [ 'daily' => [
'driver' => 'daily', 'driver' => 'daily',
'path' => storage_path('logs/laravel.log'), 'path' => storage_path('logs/laravel.log'),
'level' => env('LOG_LEVEL', 'debug'), 'level' => env('LOG_LEVEL', 'debug'),
'days' => 14, 'days' => env('LOG_DAILY_DAYS', 14),
], 'replace_placeholders' => true,
'webhook' => [
'driver' => 'daily',
'path' => storage_path('logs/webhook.log'),
'level' => env('LOG_LEVEL', 'debug'),
], ],
'slack' => [ 'slack' => [
'driver' => 'slack', 'driver' => 'slack',
'url' => env('LOG_SLACK_WEBHOOK_URL'), 'url' => env('LOG_SLACK_WEBHOOK_URL'),
'username' => 'Laravel Log', 'username' => env('LOG_SLACK_USERNAME', 'Laravel Log'),
'emoji' => ':boom:', 'emoji' => env('LOG_SLACK_EMOJI', ':boom:'),
'level' => env('LOG_LEVEL', 'critical'), 'level' => env('LOG_LEVEL', 'critical'),
'replace_placeholders' => true,
], ],
'papertrail' => [ 'papertrail' => [
'driver' => 'monolog', 'driver' => 'monolog',
'level' => env('LOG_LEVEL', 'debug'), 'level' => env('LOG_LEVEL', 'debug'),
'handler' => SyslogUdpHandler::class, 'handler' => env('LOG_PAPERTRAIL_HANDLER', SyslogUdpHandler::class),
'handler_with' => [ 'handler_with' => [
'host' => env('PAPERTRAIL_URL'), 'host' => env('PAPERTRAIL_URL'),
'port' => env('PAPERTRAIL_PORT'), 'port' => env('PAPERTRAIL_PORT'),
'connectionString' => 'tls://'.env('PAPERTRAIL_URL').':'.env('PAPERTRAIL_PORT'),
], ],
'processors' => [PsrLogMessageProcessor::class],
], ],
'stderr' => [ 'stderr' => [
@ -86,16 +102,20 @@ return [
'with' => [ 'with' => [
'stream' => 'php://stderr', 'stream' => 'php://stderr',
], ],
'processors' => [PsrLogMessageProcessor::class],
], ],
'syslog' => [ 'syslog' => [
'driver' => 'syslog', 'driver' => 'syslog',
'level' => env('LOG_LEVEL', 'debug'), 'level' => env('LOG_LEVEL', 'debug'),
'facility' => env('LOG_SYSLOG_FACILITY', LOG_USER),
'replace_placeholders' => true,
], ],
'errorlog' => [ 'errorlog' => [
'driver' => 'errorlog', 'driver' => 'errorlog',
'level' => env('LOG_LEVEL', 'debug'), 'level' => env('LOG_LEVEL', 'debug'),
'replace_placeholders' => true,
], ],
'null' => [ 'null' => [
@ -106,6 +126,7 @@ return [
'emergency' => [ 'emergency' => [
'path' => storage_path('logs/laravel.log'), 'path' => storage_path('logs/laravel.log'),
], ],
], ],
]; ];

View File

@ -4,54 +4,107 @@ return [
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Mail Driver | Default Mailer
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Laravel supports both SMTP and PHP's "mail" function as drivers for the | This option controls the default mailer that is used to send all email
| sending of e-mail. You may specify which one you're using throughout | messages unless another mailer is explicitly specified when sending
| your application here. By default, Laravel is setup for SMTP mail. | the message. All additional mailers can be configured within the
| | "mailers" array. Examples of each type of mailer are provided.
| Supported: "smtp", "sendmail", "mailgun", "ses",
| "postmark", "log", "array"
| |
*/ */
'driver' => env('MAIL_DRIVER', 'smtp'), 'default' => env('MAIL_MAILER', 'log'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| SMTP Host Address | Mailer Configurations
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Here you may provide the host address of the SMTP server used by your | Here you may configure all of the mailers used by your application plus
| applications. A default option is provided that is compatible with | their respective settings. Several examples have been configured for
| the Mailgun mail service which will provide reliable deliveries. | you and you are free to add your own as your application requires.
|
| Laravel supports a variety of mail "transport" drivers that can be used
| when delivering an email. You may specify which one you're using for
| your mailers below. You may also add additional mailers if needed.
|
| Supported: "smtp", "sendmail", "mailgun", "ses", "ses-v2",
| "postmark", "resend", "log", "array",
| "failover", "roundrobin"
| |
*/ */
'host' => env('MAIL_HOST', 'smtp.mailgun.org'), 'mailers' => [
/* 'smtp' => [
|-------------------------------------------------------------------------- 'transport' => 'smtp',
| SMTP Host Port 'url' => env('MAIL_URL'),
|-------------------------------------------------------------------------- 'host' => env('MAIL_HOST', '127.0.0.1'),
| 'port' => env('MAIL_PORT', 2525),
| This is the SMTP port used by your application to deliver e-mails to 'encryption' => env('MAIL_ENCRYPTION', 'tls'),
| users of the application. Like the host we have set this value to 'username' => env('MAIL_USERNAME'),
| stay compatible with the Mailgun e-mail application by default. 'password' => env('MAIL_PASSWORD'),
| 'timeout' => null,
*/ 'local_domain' => env('MAIL_EHLO_DOMAIN', parse_url(env('APP_URL', 'http://localhost'), PHP_URL_HOST)),
],
'port' => env('MAIL_PORT', 587), 'ses' => [
'transport' => 'ses',
],
'postmark' => [
'transport' => 'postmark',
// 'message_stream_id' => env('POSTMARK_MESSAGE_STREAM_ID'),
// 'client' => [
// 'timeout' => 5,
// ],
],
'resend' => [
'transport' => 'resend',
],
'sendmail' => [
'transport' => 'sendmail',
'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -bs -i'),
],
'log' => [
'transport' => 'log',
'channel' => env('MAIL_LOG_CHANNEL'),
],
'array' => [
'transport' => 'array',
],
'failover' => [
'transport' => 'failover',
'mailers' => [
'smtp',
'log',
],
],
'roundrobin' => [
'transport' => 'roundrobin',
'mailers' => [
'ses',
'postmark',
],
],
],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Global "From" Address | Global "From" Address
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| You may wish for all e-mails sent by your application to be sent from | You may wish for all emails sent by your application to be sent from
| the same address. Here, you may specify a name and address that is | the same address. Here you may specify a name and address that is
| used globally for all e-mails that are sent by your application. | used globally for all emails that are sent by your application.
| |
*/ */
@ -60,79 +113,4 @@ return [
'name' => env('MAIL_FROM_NAME', 'Example'), 'name' => env('MAIL_FROM_NAME', 'Example'),
], ],
/*
|--------------------------------------------------------------------------
| E-Mail Encryption Protocol
|--------------------------------------------------------------------------
|
| Here you may specify the encryption protocol that should be used when
| the application send e-mail messages. A sensible default using the
| transport layer security protocol should provide great security.
|
*/
'encryption' => env('MAIL_ENCRYPTION', 'tls'),
/*
|--------------------------------------------------------------------------
| SMTP Server Username
|--------------------------------------------------------------------------
|
| If your SMTP server requires a username for authentication, you should
| set it here. This will get used to authenticate with your server on
| connection. You may also set the "password" value below this one.
|
*/
'username' => env('MAIL_USERNAME'),
'password' => env('MAIL_PASSWORD'),
/*
|--------------------------------------------------------------------------
| Sendmail System Path
|--------------------------------------------------------------------------
|
| When using the "sendmail" driver to send e-mails, we will need to know
| the path to where Sendmail lives on this server. A default path has
| been provided here, which will work well on most of your systems.
|
*/
'sendmail' => '/usr/sbin/sendmail -t',
/*
|--------------------------------------------------------------------------
| Markdown Mail Settings
|--------------------------------------------------------------------------
|
| If you are using Markdown based email rendering, you may configure your
| theme and component paths here, allowing you to customize the design
| of the emails. Or, you may simply stick with the Laravel defaults!
|
*/
'markdown' => [
'theme' => 'default',
'paths' => [
resource_path('views/vendor/mail'),
],
],
/*
|--------------------------------------------------------------------------
| Log Channel
|--------------------------------------------------------------------------
|
| If you are using the "log" driver, you may specify the logging channel
| if you prefer to keep mail messages separate from other log entries
| for simpler reading. Otherwise, the default channel will be used.
|
*/
'log_channel' => env('MAIL_LOG_CHANNEL'),
'local_domain' => env('HOSTNAME'),
'verify_peer' => false,
]; ];

View File

@ -7,22 +7,22 @@ return [
| Default Queue Connection Name | Default Queue Connection Name
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Laravel's queue API supports an assortment of back-ends via a single | Laravel's queue supports a variety of backends via a single, unified
| API, giving you convenient access to each back-end using the same | API, giving you convenient access to each backend using identical
| syntax for every one. Here you may define a default connection. | syntax for each. The default queue connection is defined below.
| |
*/ */
'default' => env('QUEUE_CONNECTION', 'sync'), 'default' => env('QUEUE_CONNECTION', 'database'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Queue Connections | Queue Connections
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Here you may configure the connection information for each server that | Here you may configure the connection options for every queue backend
| is used by your application. A default configuration has been added | used by your application. An example configuration is provided for
| for each back-end shipped with Laravel. You are free to add more. | each backend supported by Laravel. You're also free to add more.
| |
| Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null" | Drivers: "sync", "database", "beanstalkd", "sqs", "redis", "null"
| |
@ -36,17 +36,20 @@ return [
'database' => [ 'database' => [
'driver' => 'database', 'driver' => 'database',
'table' => 'jobs', 'connection' => env('DB_QUEUE_CONNECTION'),
'queue' => 'default', 'table' => env('DB_QUEUE_TABLE', 'jobs'),
'retry_after' => 90, 'queue' => env('DB_QUEUE', 'default'),
'retry_after' => (int) env('DB_QUEUE_RETRY_AFTER', 90),
'after_commit' => false,
], ],
'beanstalkd' => [ 'beanstalkd' => [
'driver' => 'beanstalkd', 'driver' => 'beanstalkd',
'host' => 'localhost', 'host' => env('BEANSTALKD_QUEUE_HOST', 'localhost'),
'queue' => 'default', 'queue' => env('BEANSTALKD_QUEUE', 'default'),
'retry_after' => 90, 'retry_after' => (int) env('BEANSTALKD_QUEUE_RETRY_AFTER', 90),
'block_for' => 0, 'block_for' => 0,
'after_commit' => false,
], ],
'sqs' => [ 'sqs' => [
@ -54,34 +57,55 @@ return [
'key' => env('AWS_ACCESS_KEY_ID'), 'key' => env('AWS_ACCESS_KEY_ID'),
'secret' => env('AWS_SECRET_ACCESS_KEY'), 'secret' => env('AWS_SECRET_ACCESS_KEY'),
'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'), 'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
'queue' => env('SQS_QUEUE', 'your-queue-name'), 'queue' => env('SQS_QUEUE', 'default'),
'suffix' => env('SQS_SUFFIX'),
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
'after_commit' => false,
], ],
'redis' => [ 'redis' => [
'driver' => 'redis', 'driver' => 'redis',
'connection' => 'default', 'connection' => env('REDIS_QUEUE_CONNECTION', 'default'),
'queue' => env('REDIS_QUEUE', 'default'), 'queue' => env('REDIS_QUEUE', 'default'),
'retry_after' => 90, 'retry_after' => (int) env('REDIS_QUEUE_RETRY_AFTER', 90),
'block_for' => null, 'block_for' => null,
'after_commit' => false,
], ],
], ],
/*
|--------------------------------------------------------------------------
| Job Batching
|--------------------------------------------------------------------------
|
| The following options configure the database and table that store job
| batching information. These options can be updated to any database
| connection and table which has been defined by your application.
|
*/
'batching' => [
'database' => env('DB_CONNECTION', 'sqlite'),
'table' => 'job_batches',
],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Failed Queue Jobs | Failed Queue Jobs
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| These options configure the behavior of failed queue job logging so you | These options configure the behavior of failed queue job logging so you
| can control which database and table are used to store the jobs that | can control how and where failed jobs are stored. Laravel ships with
| have failed. You may change them to any database / table you wish. | support for storing failed jobs in a simple file or in a database.
|
| Supported drivers: "database-uuids", "dynamodb", "file", "null"
| |
*/ */
'failed' => [ 'failed' => [
'driver' => env('QUEUE_FAILED_DRIVER', 'database'), 'driver' => env('QUEUE_FAILED_DRIVER', 'database-uuids'),
'database' => env('DB_CONNECTION', 'mysql'), 'database' => env('DB_CONNECTION', 'sqlite'),
'table' => 'failed_jobs', 'table' => 'failed_jobs',
], ],

View File

@ -14,12 +14,6 @@ return [
| |
*/ */
'mailgun' => [
'domain' => env('MAILGUN_DOMAIN'),
'secret' => env('MAILGUN_SECRET'),
'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
],
'postmark' => [ 'postmark' => [
'token' => env('POSTMARK_TOKEN'), 'token' => env('POSTMARK_TOKEN'),
], ],
@ -30,30 +24,35 @@ return [
'region' => env('AWS_DEFAULT_REGION', 'us-east-1'), 'region' => env('AWS_DEFAULT_REGION', 'us-east-1'),
], ],
'ezypay' => [ 'resend' => [
'plugin' => 'DD_EZYPAY', 'key' => env('RESEND_KEY'),
'base_uri' => 'https://api.ezypay.com/api/v1/',
'token_user' => env('EZYPAY_TOKEN'),
'guid' => env('EZYPAY_GUID'),
], ],
'google' => [ 'slack' => [
'client_id' => env('AUTH_GOOGLE_CLIENT_ID'), 'notifications' => [
'client_secret' => env('AUTH_GOOGLE_SECRET'), 'bot_user_oauth_token' => env('SLACK_BOT_USER_OAUTH_TOKEN'),
'redirect' => '/auth/google/callback', 'channel' => env('SLACK_BOT_USER_DEFAULT_CHANNEL'),
],
'provider' => [
'intuit' => [
'api'=> \Intuit\API::class,
'verifytoken' => env('INTUIT_VERIFYTOKEN'),
]
],
'supplier' => [
'crazydomain' => [
'api'=> \Dreamscape\API::class,
'registrar' => 'crazydomain', // Key in the domain_registrars table
], ],
], ],
'ezypay' => [
'plugin' => 'DD_EZYPAY',
'base_uri' => 'https://api.ezypay.com/api/v1/',
'token_user' => env('EZYPAY_TOKEN'),
'guid' => env('EZYPAY_GUID'),
],
'provider' => [
'intuit' => [
'api'=> \Intuit\API::class,
'verifytoken' => env('INTUIT_VERIFYTOKEN'),
]
],
'supplier' => [
'crazydomain' => [
'api'=> \Dreamscape\API::class,
'registrar' => 'crazydomain', // Key in the domain_registrars table
],
],
]; ];

View File

@ -9,16 +9,16 @@ return [
| Default Session Driver | Default Session Driver
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| This option controls the default session "driver" that will be used on | This option determines the default session driver that is utilized for
| requests. By default, we will use the lightweight native driver but | incoming requests. Laravel supports a variety of storage options to
| you may specify any of the other wonderful drivers provided here. | persist session data. Database storage is a great default choice.
| |
| Supported: "file", "cookie", "database", "apc", | Supported: "file", "cookie", "database", "apc",
| "memcached", "redis", "dynamodb", "array" | "memcached", "redis", "dynamodb", "array"
| |
*/ */
'driver' => env('SESSION_DRIVER', 'file'), 'driver' => env('SESSION_DRIVER', 'database'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -27,13 +27,14 @@ return [
| |
| Here you may specify the number of minutes that you wish the session | Here you may specify the number of minutes that you wish the session
| to be allowed to remain idle before it expires. If you want them | to be allowed to remain idle before it expires. If you want them
| to immediately expire on the browser closing, set that option. | to expire immediately when the browser is closed then you may
| indicate that via the expire_on_close configuration option.
| |
*/ */
'lifetime' => env('SESSION_LIFETIME', 120), 'lifetime' => env('SESSION_LIFETIME', 120),
'expire_on_close' => false, 'expire_on_close' => env('SESSION_EXPIRE_ON_CLOSE', false),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -41,21 +42,21 @@ return [
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| This option allows you to easily specify that all of your session data | This option allows you to easily specify that all of your session data
| should be encrypted before it is stored. All encryption will be run | should be encrypted before it's stored. All encryption is performed
| automatically by Laravel and you can use the Session like normal. | automatically by Laravel and you may use the session like normal.
| |
*/ */
'encrypt' => false, 'encrypt' => env('SESSION_ENCRYPT', false),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Session File Location | Session File Location
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| When using the native session driver, we need a location where session | When utilizing the "file" session driver, the session files are placed
| files may be stored. A default has been set for you but a different | on disk. The default storage location is defined here; however, you
| location may be specified. This is only needed for file sessions. | are free to provide another location where they should be stored.
| |
*/ */
@ -72,33 +73,35 @@ return [
| |
*/ */
'connection' => env('SESSION_CONNECTION', null), 'connection' => env('SESSION_CONNECTION'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Session Database Table | Session Database Table
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| When using the "database" session driver, you may specify the table we | When using the "database" session driver, you may specify the table to
| should use to manage the sessions. Of course, a sensible default is | be used to store sessions. Of course, a sensible default is defined
| provided for you; however, you are free to change this as needed. | for you; however, you're welcome to change this to another table.
| |
*/ */
'table' => 'sessions', 'table' => env('SESSION_TABLE', 'sessions'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Session Cache Store | Session Cache Store
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| When using the "apc", "memcached", or "dynamodb" session drivers you may | When using one of the framework's cache driven session backends, you may
| list a cache store that should be used for these sessions. This value | define the cache store which should be used to store the session data
| must match with one of the application's configured cache "stores". | between requests. This must match one of your defined cache stores.
|
| Affects: "apc", "dynamodb", "memcached", "redis"
| |
*/ */
'store' => env('SESSION_STORE', null), 'store' => env('SESSION_STORE'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -118,9 +121,9 @@ return [
| Session Cookie Name | Session Cookie Name
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Here you may change the name of the cookie used to identify a session | Here you may change the name of the session cookie that is created by
| instance by ID. The name specified here will get used every time a | the framework. Typically, you should not need to change this value
| new session cookie is created by the framework for every driver. | since doing so does not grant a meaningful security improvement.
| |
*/ */
@ -136,24 +139,24 @@ return [
| |
| The session cookie path determines the path for which the cookie will | The session cookie path determines the path for which the cookie will
| be regarded as available. Typically, this will be the root path of | be regarded as available. Typically, this will be the root path of
| your application but you are free to change this when necessary. | your application, but you're free to change this when necessary.
| |
*/ */
'path' => '/', 'path' => env('SESSION_PATH', '/'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Session Cookie Domain | Session Cookie Domain
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Here you may change the domain of the cookie used to identify a session | This value determines the domain and subdomains the session cookie is
| in your application. This will determine which domains the cookie is | available to. By default, the cookie will be available to the root
| available to in your application. A sensible default has been set. | domain and all subdomains. Typically, this shouldn't be changed.
| |
*/ */
'domain' => env('SESSION_DOMAIN', null), 'domain' => env('SESSION_DOMAIN'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -162,11 +165,11 @@ return [
| |
| By setting this option to true, session cookies will only be sent back | By setting this option to true, session cookies will only be sent back
| to the server if the browser has a HTTPS connection. This will keep | to the server if the browser has a HTTPS connection. This will keep
| the cookie from being sent to you if it can not be done securely. | the cookie from being sent to you when it can't be done securely.
| |
*/ */
'secure' => env('SESSION_SECURE_COOKIE', false), 'secure' => env('SESSION_SECURE_COOKIE'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -175,11 +178,11 @@ return [
| |
| Setting this value to true will prevent JavaScript from accessing the | Setting this value to true will prevent JavaScript from accessing the
| value of the cookie and the cookie will only be accessible through | value of the cookie and the cookie will only be accessible through
| the HTTP protocol. You are free to modify this option if needed. | the HTTP protocol. It's unlikely you should disable this option.
| |
*/ */
'http_only' => true, 'http_only' => env('SESSION_HTTP_ONLY', true),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
@ -188,12 +191,27 @@ return [
| |
| This option determines how your cookies behave when cross-site requests | This option determines how your cookies behave when cross-site requests
| take place, and can be used to mitigate CSRF attacks. By default, we | take place, and can be used to mitigate CSRF attacks. By default, we
| do not enable this as other CSRF protection services are in place. | will set this value to "lax" to permit secure cross-site requests.
| |
| Supported: "lax", "strict" | See: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie#samesitesamesite-value
|
| Supported: "lax", "strict", "none", null
| |
*/ */
'same_site' => 'lax', 'same_site' => env('SESSION_SAME_SITE', 'lax'),
/*
|--------------------------------------------------------------------------
| Partitioned Cookies
|--------------------------------------------------------------------------
|
| Setting this value to true will tie the cookie to the top-level site for
| a cross-site context. Partitioned cookies are accepted by the browser
| when flagged "secure" and the Same-Site attribute is set to "none".
|
*/
'partitioned' => env('SESSION_PARTITIONED_COOKIE', false),
]; ];

View File

@ -1,19 +0,0 @@
<?php
return [
'pdf' => array(
'enabled' => true,
'binary' => '/usr/local/bin/wkhtmltopdf',
'timeout' => false,
'options' => array('print-media-type' => true),
'env' => array(),
),
'image' => array(
'enabled' => false,
'binary' => '/usr/local/bin/wkhtmltoimage',
'timeout' => false,
'options' => array(),
'env' => array(),
),
];

View File

@ -1,36 +0,0 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| View Storage Paths
|--------------------------------------------------------------------------
|
| Most templating systems load templates from disk. Here you may specify
| an array of paths that should be checked for your views. Of course
| the usual Laravel view path has already been registered for you.
|
*/
'paths' => [
resource_path('views'),
],
/*
|--------------------------------------------------------------------------
| Compiled View Path
|--------------------------------------------------------------------------
|
| This option determines where all the compiled Blade templates will be
| stored for your application. Typically, this is within the storage
| directory. However, as usual, you are free to change this value.
|
*/
'compiled' => env(
'VIEW_COMPILED_PATH',
realpath(storage_path('framework/views'))
),
];

View File

@ -25,23 +25,23 @@
<div class="col-md-3"> <div class="col-md-3">
@switch($o->order_status) @switch($o->order_status)
@case('ORDER-SUBMIT') @case('ORDER-SUBMIT')
@include('a.widgets.service.order.submit') @include('theme.backend.adminlte.a.widgets.service.order.submit')
@break @break
@case('ORDER-HOLD') @case('ORDER-HOLD')
@case('ORDER-SENT') @case('ORDER-SENT')
@case('ORDERED') @case('ORDERED')
@include('a.widgets.service.order.sent') @include('theme.backend.adminlte.a.widgets.service.order.sent')
@break @break
@default @default
@include('u.widgets.service.info') @include('theme.backend.adminlte.u.widgets.service.info')
@endswitch @endswitch
</div> </div>
@if($o->order_status == 'ORDER-REQUEST') @if($o->order_status == 'ORDER-REQUEST')
<div class="col-md-3"> <div class="col-md-3">
@include('a.widgets.service_order-request') @include('theme.backend.adminlte.a.widgets.service_order-request')
</div> </div>
@endif @endif
</div> </div>

View File

@ -17,7 +17,7 @@
@section('main-content') @section('main-content')
<!-- Our Summary Home Page Boxes --> <!-- Our Summary Home Page Boxes -->
<div class="row"> <div class="row">
@include('common.account.widget.summary') @include('theme.backend.adminlte.common.account.widget.summary')
</div> </div>
<div class="card card-light card-tabs"> <div class="card card-light card-tabs">
@ -54,9 +54,11 @@
<li class="nav-item"><a class="nav-link" href="#tab-nextinvoice" data-toggle="tab">Next Invoice</a></li> <li class="nav-item"><a class="nav-link" href="#tab-nextinvoice" data-toggle="tab">Next Invoice</a></li>
--}} --}}
<li class="nav-item"><a class="nav-link" href="#tab-futureinvoice" data-toggle="tab">Future Invoice</a></li> <li class="nav-item"><a class="nav-link" href="#tab-futureinvoice" data-toggle="tab">Future Invoice</a></li>
@canany('reseller','wholesaler')
<li class="nav-item ml-auto"> <li class="nav-item ml-auto">
<a class="nav-link {{ session()->has('supplier_update') ? 'active' : '' }}" href="#tab-supplier" data-toggle="tab">Supplier</a> <a class="nav-link {{ session()->has('supplier_update') ? 'active' : '' }}" href="#tab-supplier" data-toggle="tab">Supplier</a>
</li> </li>
@endcanany
</ul> </ul>
</div> </div>
@ -65,15 +67,15 @@
<div class="tab-pane {{ (! session()->has('supplier_update')) ? 'active' : '' }}" id="tab-services"> <div class="tab-pane {{ (! session()->has('supplier_update')) ? 'active' : '' }}" id="tab-services">
<div class="row"> <div class="row">
<div class="col-12 col-xl-7"> <div class="col-12 col-xl-7">
@include('service.widget.active',['o'=>$ao]) @include('theme.backend.adminlte.service.widget.active',['o'=>$ao])
</div> </div>
<div class="col-12 col-xl-5"> <div class="col-12 col-xl-5">
@include('invoice.widget.due',['o'=>$ao]) @include('theme.backend.adminlte.invoice.widget.due',['o'=>$ao])
@include('invoice.widget.list',['o'=>$ao]) @include('theme.backend.adminlte.invoice.widget.list',['o'=>$ao])
@include('payment.widget.list',['o'=>$ao]) @include('theme.backend.adminlte.payment.widget.list',['o'=>$ao])
</div> </div>
</div> </div>
</div> </div>
@ -83,7 +85,7 @@
<div class="tab-pane" id="tab-nextinvoice"> <div class="tab-pane" id="tab-nextinvoice">
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
@include('u.invoice.widgets.next',['future'=>FALSE]) @include('theme.backend.adminlte.u.invoice.widgets.next',['future'=>FALSE])
</div> </div>
</div> </div>
</div> </div>
@ -92,14 +94,14 @@
<div class="tab-pane" id="tab-futureinvoice"> <div class="tab-pane" id="tab-futureinvoice">
<div class="row"> <div class="row">
<div class="col-12 col-xl-9"> <div class="col-12 col-xl-9">
@include('invoice.widget.next',['future'=>TRUE]) @include('theme.backend.adminlte.invoice.widget.next',['future'=>TRUE])
</div> </div>
</div> </div>
</div> </div>
@canany('reseller','wholesaler') @canany('reseller','wholesaler')
<div class="tab-pane {{ session()->pull('supplier_update') ? 'active' : '' }}" id="tab-supplier" role="tabpanel"> <div class="tab-pane {{ session()->pull('supplier_update') ? 'active' : '' }}" id="tab-supplier" role="tabpanel">
@include('user.widget.supplier') @include('theme.backend.adminlte.user.widget.supplier')
</div> </div>
@endcanany @endcanany
</div> </div>
@ -112,7 +114,7 @@
@if ($o == $user) @if ($o == $user)
@canany('reseller','wholesaler') @canany('reseller','wholesaler')
<div class="tab-pane" id="tab-reseller" role="tabpanel"> <div class="tab-pane" id="tab-reseller" role="tabpanel">
@include('r.home.widgets.home') @include('theme.backend.adminlte.r.home.widgets.home')
</div> </div>
@endcanany @endcanany
@endif @endif

View File

@ -148,7 +148,7 @@
<td style="width: 50px;"><i class="fa-2x fa-fw {{ $cho->icon }}"></i></td> <td style="width: 50px;"><i class="fa-2x fa-fw {{ $cho->icon }}"></i></td>
<td>{{ $cho->name }}</td> <td>{{ $cho->name }}</td>
<td>{{ $cho->description }}</td> <td>{{ $cho->description }}</td>
<td class="w-25">@includeIf('payment.widget.plugin.'.strtolower($cho->plugin),['o'=>$cho])</td> <td class="w-25">@includeIf('theme.backend.adminlte.payment.widget.plugin.'.strtolower($cho->plugin),['o'=>$cho])</td>
</tr> </tr>
@endforeach @endforeach
</table> </table>

View File

@ -28,7 +28,7 @@
<div class="card-body"> <div class="card-body">
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane fade active show" id="details" role="tabpanel"> <div class="tab-pane fade active show" id="details" role="tabpanel">
@include('payment.widget.detail') @include('theme.backend.adminlte.payment.widget.detail')
</div> </div>
</div> </div>
</div> </div>

View File

@ -16,7 +16,7 @@
@section('main-content') @section('main-content')
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
@include('product.widget.selector') @include('theme.backend.adminlte.product.widget.selector')
</div> </div>
</div> </div>
@ -33,11 +33,11 @@
<div class="card-body"> <div class="card-body">
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane fade active show" id="details" role="tabpanel"> <div class="tab-pane fade active show" id="details" role="tabpanel">
@include('product.widget.detail') @include('theme.backend.adminlte.product.widget.detail')
</div> </div>
<div class="tab-pane fade" id="services" role="tabpanel"> <div class="tab-pane fade" id="services" role="tabpanel">
@include('product.widget.services') @include('theme.backend.adminlte.product.widget.services')
</div> </div>
</div> </div>
</div> </div>

View File

@ -16,7 +16,7 @@
@section('main-content') @section('main-content')
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
@include('product.widget.selector') @include('theme.backend.adminlte.product.widget.selector')
</div> </div>
</div> </div>
@endsection @endsection

View File

@ -1,10 +1,10 @@
<div class="row"> <div class="row">
<div class="col-4"> <div class="col-4">
@include('r.account.widgets.list') @include('theme.backend.adminlte.r.account.widgets.list')
</div> </div>
<div class="col-8"> <div class="col-8">
@include('service.widget.movement') @include('theme.backend.adminlte.service.widget.movement')
@include('r.invoice.widgets.due') @include('theme.backend.adminlte.r.invoice.widgets.due')
</div> </div>
</div> </div>

View File

@ -45,7 +45,7 @@
</div> </div>
{{-- {{--
@includeIf('service.widget.'.$o->product->category.'.order',['o'=>$o->type]) @includeIf('theme.backend.adminlte.service.widget.'.$o->product->category.'.order',['o'=>$o->type])
--}} --}}
<div class="form-group row"> <div class="form-group row">

View File

@ -153,7 +153,7 @@
</div> </div>
<div class="card-body"> <div class="card-body">
@include('service.widget.internal',['o'=>$o,'p'=>$np]) @include('theme.backend.adminlte.service.widget.internal',['o'=>$o,'p'=>$np])
</div> </div>
</div> </div>
</div> </div>

View File

@ -44,7 +44,7 @@
</div> </div>
</div> </div>
@includeIf('service.widget.'.$o->product->category.'.change',['o'=>$o->type]) @includeIf('theme.backend.adminlte.service.widget.'.$o->product->category.'.change',['o'=>$o->type])
<div class="form-group row"> <div class="form-group row">
<label for="notes" class="col-2 col-form-label text-right">Notes</label> <label for="notes" class="col-2 col-form-label text-right">Notes</label>

View File

@ -18,8 +18,8 @@
<div class="row"> <div class="row">
<!-- Service Details --> <!-- Service Details -->
<div class="col-12 col-md-5"> <div class="col-12 col-md-5">
@includeIf('service.widget.'.$o->product->category.'.details',['o'=>$o->type]) @includeIf('theme.backend.adminlte.service.widget.'.$o->product->category.'.details',['o'=>$o->type])
@include('service.widget.information') @include('theme.backend.adminlte.service.widget.information')
</div> </div>
<div class="col-12 col-md-7"> <div class="col-12 col-md-7">
@ -71,13 +71,13 @@
</div> </div>
@if (! $o->suspend_billing AND ! $o->external_billing) @if (! $o->suspend_billing AND ! $o->external_billing)
<div class="tab-pane fade {{ (! session()->has('service_update')) ? 'active show' : '' }}" id="pending_items" role="tabpanel"> <div class="tab-pane fade {{ (! session()->has('service_update')) ? 'active show' : '' }}" id="pending_items" role="tabpanel">
@include('service.widget.invoice') @include('theme.backend.adminlte.service.widget.invoice')
</div> </div>
@endif @endif
@if ($o->hasUsage()) @if ($o->hasUsage())
<div class="tab-pane fade {{ (! $o->isBilled() && (! session()->has('service_update'))) ? 'active show' : '' }}" id="traffic" role="tabpanel"> <div class="tab-pane fade {{ (! $o->isBilled() && (! session()->has('service_update'))) ? 'active show' : '' }}" id="traffic" role="tabpanel">
@if ($o->type->usage(30)->count()) @if ($o->type->usage(30)->count())
@include('service.widget.'.$o->product->category.'.usagegraph',['o'=>$o->type]) @include('theme.backend.adminlte.service.widget.'.$o->product->category.'.usagegraph',['o'=>$o->type])
@endif @endif
</div> </div>
@endif @endif
@ -88,16 +88,19 @@
Email. Email.
</div> </div>
@can('wholesaler') @can('wholesaler')
<div class="tab-pane fade" id="billing" role="tabpanel">
@include('theme.backend.adminlte.service.widget.billinghistory',['o'=>$o])
</div>
<div class="tab-pane fade" id="internal" role="tabpanel"> <div class="tab-pane fade" id="internal" role="tabpanel">
@if(($x=$o->changes()->where('service__change.active',TRUE)->where('complete',FALSE)->get()->pop())) @if(($x=$o->changes()->where('service__change.active',TRUE)->where('complete',FALSE)->get()->pop()))
@include('service.widget.internal',['o'=>$o,'p'=>$x]) @include('theme.backend.adminlte.service.widget.internal',['o'=>$o,'p'=>$x])
@else @else
@include('service.widget.internal',['o'=>$o,'p'=>new \App\Models\Product()]) @include('theme.backend.adminlte.service.widget.internal',['o'=>$o,'p'=>new \App\Models\Product()])
@endif @endif
</div> </div>
<div class="tab-pane fade {{ session()->pull('service_update') ? 'active show' : '' }}" id="update" role="tabpanel"> <div class="tab-pane fade {{ session()->pull('service_update') ? 'active show' : '' }}" id="update" role="tabpanel">
@include('service.widget.update') @include('theme.backend.adminlte.service.widget.update')
</div> </div>
@endcan @endcan
</div> </div>

View File

@ -38,7 +38,7 @@
</div> </div>
</div> </div>
@includeIf('service.widget.'.$o->product->category.'.order',['o'=>$o->type]) @includeIf('theme.backend.adminlte.service.widget.'.$o->product->category.'.order',['o'=>$o->type])
<div class="form-group row"> <div class="form-group row">
<label for="notes" class="col-sm-2 col-form-label text-right">Notes</label> <label for="notes" class="col-sm-2 col-form-label text-right">Notes</label>

View File

@ -38,7 +38,7 @@
</div> </div>
</div> </div>
@includeIf('service.widget.'.$o->product->category.'.order',['o'=>$o->type]) @includeIf('theme.backend.adminlte.service.widget.'.$o->product->category.'.order',['o'=>$o->type])
<div class="form-group row"> <div class="form-group row">
<label for="notes" class="col-sm-2 col-form-label text-right">Notes</label> <label for="notes" class="col-sm-2 col-form-label text-right">Notes</label>

View File

@ -72,7 +72,7 @@
<hr> <hr>
@includeIf('service.widget.'.$o->product->category.'.update',['o'=>$o->type]) @includeIf('theme.backend.adminlte.service.widget.'.$o->product->category.'.update',['o'=>$o->type])
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">

View File

@ -32,24 +32,24 @@
<div class="card-body"> <div class="card-body">
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane fade active show" id="details" role="tabpanel"> <div class="tab-pane fade active show" id="details" role="tabpanel">
@include('supplier.widget.detail') @include('theme.backend.adminlte.supplier.widget.detail')
</div> </div>
@if($o->exists) @if($o->exists)
<div class="tab-pane fade" id="products" role="tabpanel"> <div class="tab-pane fade" id="products" role="tabpanel">
@include('supplier.widget.products') @include('theme.backend.adminlte.supplier.widget.products')
</div> </div>
<div class="tab-pane fade" id="offerings" role="tabpanel"> <div class="tab-pane fade" id="offerings" role="tabpanel">
@include('supplier.widget.offerings') @include('theme.backend.adminlte.supplier.widget.offerings')
</div> </div>
<div class="tab-pane fade" id="connections" role="tabpanel"> <div class="tab-pane fade" id="connections" role="tabpanel">
@include('supplier.widget.connections') @include('theme.backend.adminlte.supplier.widget.connections')
</div> </div>
<div class="tab-pane fade" id="costs" role="tabpanel"> <div class="tab-pane fade" id="costs" role="tabpanel">
@include('supplier.widget.costs') @include('theme.backend.adminlte.supplier.widget.costs')
</div> </div>
@endif @endif
</div> </div>

View File

@ -202,7 +202,7 @@
<div class="col-sm-6" id="product_info"> <div class="col-sm-6" id="product_info">
@if (old('product_id')) @if (old('product_id'))
@include('order.widget.info',['o'=>$po]) @include('theme.frontend.metronic.order.widget.info',['o'=>$po])
@endif @endif
</div> </div>
</div> </div>
@ -210,7 +210,7 @@
<div class="row"> <div class="row">
<div class="col-sm-12" id="product_order"> <div class="col-sm-12" id="product_order">
@if (old('product_id')) @if (old('product_id'))
@include('order.widget.order',['o'=>$po]) @include('theme.frontend.metronic.order.widget.order',['o'=>$po])
@endif @endif
</div> </div>
</div> </div>

View File

@ -3,7 +3,7 @@
<div class="box box-primary"> <div class="box box-primary">
<div class="box-body"> <div class="box-body">
{{-- Return Category Requirements --}} {{-- Return Category Requirements --}}
@include('order.widget.info.'.$o->category) @include('theme.frontend.metronic.order.widget.info.'.$o->category)
{{-- Return Supplier Requirements --}} {{-- Return Supplier Requirements --}}
{{-- Return Product Requirements --}} {{-- Return Product Requirements --}}

View File

@ -1,5 +1,5 @@
<!-- $o = Product::class --> <!-- $o = Product::class -->
@include('order.widget.info.base',['footer'=>' @include('theme.frontend.metronic.order.widget.info.base',['footer'=>'
<sup> <sup>
* Additional setup charges may apply for complex installations.<br> * Additional setup charges may apply for complex installations.<br>
+ Additional charges may apply for regional installations. + Additional charges may apply for regional installations.

View File

@ -1,5 +1,5 @@
<!-- $o = Product::class --> <!-- $o = Product::class -->
@include('order.widget.info.base',['footer'=>' @include('theme.frontend.metronic.order.widget.info.base',['footer'=>'
<sup> <sup>
* Depends on domain availability.<br> * Depends on domain availability.<br>
+ Domain availability may change the initial cost. + Domain availability may change the initial cost.

View File

@ -1,5 +1,5 @@
<!-- $o = Product::class --> <!-- $o = Product::class -->
@include('order.widget.info.base',['footer'=>' @include('theme.frontend.metronic.order.widget.info.base',['footer'=>'
<sup> <sup>
* Depends on domain availability.<br> * Depends on domain availability.<br>
+ Domain availability may change the initial cost. + Domain availability may change the initial cost.

View File

@ -1,5 +1,5 @@
<!-- $o = Product::class --> <!-- $o = Product::class -->
@include('order.widget.info.base',['footer'=>' @include('theme.frontend.metronic.order.widget.info.base',['footer'=>'
<sup> <sup>
* Depends on domain availability.<br> * Depends on domain availability.<br>
+ Domain availability may change the initial cost. + Domain availability may change the initial cost.

View File

@ -1,5 +1,5 @@
<!-- $o = Product::class --> <!-- $o = Product::class -->
@include('order.widget.info.base',['footer'=>' @include('theme.frontend.metronic.order.widget.info.base',['footer'=>'
<sup> <sup>
* Depends on complex porting.<br> * Depends on complex porting.<br>
+ Complex porting involves additional charges. + Complex porting involves additional charges.

View File

@ -7,7 +7,7 @@
<div class="box-body"> <div class="box-body">
{{-- Return Category Requirements --}} {{-- Return Category Requirements --}}
@include('order.widget.order.'.$o->category) @include('theme.frontend.metronic.order.widget.order.'.$o->category)
{{-- Return Supplier Requirements --}} {{-- Return Supplier Requirements --}}
{{-- Return Product Requirements --}} {{-- Return Product Requirements --}}

View File

@ -6,55 +6,53 @@
@section('main-content') @section('main-content')
{{-- SLIDER --}} {{-- SLIDER --}}
@includeIf('welcome.widgets.slider') @includeIf('theme.frontend.metronic.welcome.widgets.slider')
{{-- END SLIDER --}} {{-- END SLIDER --}}
<div class="main"> <div class="main">
<div class="container"> <div class="container">
{{-- SERVICE BOX --}} {{-- SERVICE BOX --}}
@includeIf('welcome.widgets.servicebox') @includeIf('theme.frontend.metronic.welcome.widgets.servicebox')
{{-- END SERVICE BOX --}} {{-- END SERVICE BOX --}}
{{-- TESTIMONIALS --}} {{-- TESTIMONIALS --}}
@includeIf('welcome.widgets.blockquote') @includeIf('theme.frontend.metronic.welcome.widgets.blockquote')
{{-- END TESTIMONIALS --}} {{-- END TESTIMONIALS --}}
{{-- ACTIVITY --}} {{-- ACTIVITY --}}
@includeIf('welcome.widgets.activity') @includeIf('theme.frontend.metronic.welcome.widgets.activity')
{{-- END ACTIVITY --}} {{-- END ACTIVITY --}}
@if (isset($show_page_tabs) OR isset($show_testimonials)) {{--
<!-- BEGIN TABS AND TESTIMONIALS --> <!-- BEGIN TABS AND TESTIMONIALS -->
<div class="row mix-block margin-bottom-40"> <div class="row mix-block margin-bottom-40">
{{-- TABS --}} {{-- TABS --}
@includeIf('welcome.widgets.tabs') @includeIf('theme.frontend.metronic.welcome.widgets.tabs')
{{-- END TABS --}} {{-- END TABS --}
{{-- TESTIMONIALS --}} {{-- TESTIMONIALS --}
@includeIf('welcome.widgets.testimonials') @includeIf('theme.frontend.metronic.welcome.widgets.testimonials')
{{-- END TESTIMONIALS --}} {{-- END TESTIMONIALS --}
</div> </div>
<!-- END TABS AND TESTIMONIALS --> <!-- END TABS AND TESTIMONIALS -->
@endif --}}
{{-- STEPS --}} {{-- STEPS --}}
@includeIf('welcome.widgets.steps') @includeIf('theme.frontend.metronic.welcome.widgets.steps')
{{-- END STEPS --}} {{-- END STEPS --}}
{{-- CLIENTS --}} {{--
@isset($show_clients)) {{-- CLIENTS --}
@includeIf('welcome.widgets.clients') @includeIf('theme.frontend.metronic.welcome.widgets.clients')
@endisset {{-- END CLIENTS --}
{{-- END CLIENTS --}} --}}
</div> </div>
</div> </div>
@themejs('js/layout.js','layout','jquery')
@endsection @endsection
@section('page-scripts') @section('page-scripts')
<script type="text/javascript" src="{{ asset('theme/frontend/metronic/js/layout.js') }}"></script>
<!-- PAGE LEVEL JAVASCRIPT -->
<script type="text/javascript"> <script type="text/javascript">
$(document).ready(function() { $(document).ready(function() {
Layout.init(); Layout.init();
@ -62,6 +60,4 @@
Layout.initNavScrolling(); Layout.initNavScrolling();
}); });
</script> </script>
<!-- END PAGE LEVEL JAVASCRIPTS -->
@append @append

View File

@ -132,7 +132,7 @@
autoplay: true, autoplay: true,
}); });
Fancybox.bind("[data-fancybox]", {}); Fancybox.bind("[data-fancybox]",{});
}); });
</script> </script>
@append @append

View File

@ -1,10 +1,11 @@
<!-- BEGIN BLOCKQUOTE BLOCK --> <!-- BEGIN BLOCKQUOTE BLOCK -->
<div class="row quote-v1 margin-bottom-30" style="background: #002090;"> <div class="row quote-v1 margin-bottom-30" style="background: #002090;">
<div class="col-md-9"> <div class="col-md-9">
<span class="text-uppercase"><strong>Get in contact today</strong></span> <span class="text-uppercase"><strong>Get in contact today</strong></span>
</div> </div>
<div class="col-md-3 text-right">
<a class="btn-transparent" href="mailto:help@graytech.net.au" target="_blank"><i class="fas fa-pencil-alt margin-right-10"></i><email>help</email>@<domain>graytech.net.au</domain></a> <div class="col-md-3 text-right">
</div> <a class="btn-transparent" href="mailto:help@graytech.net.au" target="_blank"><i class="fas fa-pencil-alt margin-right-10"></i><email>help</email>@<domain>graytech.net.au</domain></a>
</div>
</div> </div>
<!-- END BLOCKQUOTE BLOCK --> <!-- END BLOCKQUOTE BLOCK -->

View File

@ -10,13 +10,13 @@
<!-- Wrapper for slides --> <!-- Wrapper for slides -->
<div class="carousel-inner" role="listbox"> <div class="carousel-inner" role="listbox">
<div class="item carousel-item active" style="background-image: url( {{ asset('pages/welcome/img/slider/mobile-phone-426559_1920.jpg') }} ); background-size: cover; background-position: center center; opacity: 0.8;"> <div class="item carousel-item active" style="background-image: url( {{ asset('pages/welcome/img/slider/mobile-phone-426559_1920.jpg') }} ); background-size: cover; background-position: center center; opacity: 0.8;">
<div class="container"> <div class="container">
<div class="carousel-position-six text-uppercase text-center" style="background: rgba(100,100,100, 0.7); color: #000;padding: 20px;"> <div class="carousel-position-six text-uppercase text-center" style="background: rgba(100,100,100, 0.7); color: #000;padding: 20px;">
<h2 class="margin-bottom-20 animate-delay carousel-title-v2" data-animation="animated fadeInDown"> <h2 class="margin-bottom-20 animate-delay carousel-title-v2" data-animation="animated fadeInDown">
Internet confusing? Internet confusing?
</h2> </h2>
<p class="carousel-subtitle-v5 border-top-bottom margin-bottom-30" data-animation="animated fadeInDown">We can help you with your Internet journey.</p> <p class="carousel-subtitle-v5 border-top-bottom margin-bottom-30" data-animation="animated fadeInDown">We can help you with your Internet journey.</p>
{{-- {{--
@ -32,9 +32,11 @@
<h2 class="animate-delay carousel-title-v6 text-uppercase" data-animation="animated fadeInDown"> <h2 class="animate-delay carousel-title-v6 text-uppercase" data-animation="animated fadeInDown">
Web hosting a challenge? Web hosting a challenge?
</h2> </h2>
<p class="carousel-subtitle-v6 text-uppercase" data-animation="animated fadeInDown"> <p class="carousel-subtitle-v6 text-uppercase" data-animation="animated fadeInDown">
Graytech Hosting can take away the complexity of getting a web presence. Graytech Hosting can take away the complexity of getting a web presence.
</p> </p>
<p class="carousel-subtitle-v7 margin-bottom-30" data-animation="animated fadeInDown" style="color: #fff;"> <p class="carousel-subtitle-v7 margin-bottom-30" data-animation="animated fadeInDown" style="color: #fff;">
We can host your website, all you need is to provide the content. We can host your website, all you need is to provide the content.
</p> </p>
@ -52,10 +54,12 @@
<h2 class="margin-bottom-20 animate-delay carousel-title-v2" data-animation="animated fadeInDown"> <h2 class="margin-bottom-20 animate-delay carousel-title-v2" data-animation="animated fadeInDown">
Not sure where to begin? Not sure where to begin?
</h2> </h2>
<p class="carousel-subtitle-v5 text-uppercase" data-animation="animated fadeInDown"> <p class="carousel-subtitle-v5 text-uppercase" data-animation="animated fadeInDown">
We can manage everything from the link to the internet, your email,<br> We can manage everything from the link to the internet, your email,<br>
your website and a firewall to keep the bad folks out. your website and a firewall to keep the bad folks out.
</p> </p>
<p class="carousel-subtitle-v7 margin-bottom-30" data-animation="animated fadeInDown" style="color: #fff;"> <p class="carousel-subtitle-v7 margin-bottom-30" data-animation="animated fadeInDown" style="color: #fff;">
Get in touch. Get in touch.
</p> </p>

View File

@ -25,5 +25,4 @@
@endforeach @endforeach
</div> </div>
</div> </div>
<!-- END TABS --> <!-- END TABS -->

View File

@ -11,6 +11,6 @@
| |
*/ */
Broadcast::channel('App.User.{id}', function ($user, $id) { //Broadcast::channel('App.User.{id}', function ($user, $id) {
return (int) $user->id === (int) $id; // return (int) $user->id === (int) $id;
}); //});

View File

@ -1,18 +1,8 @@
<?php <?php
use Illuminate\Foundation\Inspiring; use Illuminate\Foundation\Inspiring;
use Illuminate\Support\Facades\Artisan;
/* //Artisan::command('inspire', function () {
|-------------------------------------------------------------------------- // $this->comment(Inspiring::quote());
| Console Routes //})->purpose('Display an inspiring quote')->hourly();
|--------------------------------------------------------------------------
|
| This file is where you may define all of your Closure based console
| commands. Each Closure is bound to a command instance allowing a
| simple approach to interacting with each command's IO methods.
|
*/
Artisan::command('inspire', function () {
$this->comment(Inspiring::quote());
})->describe('Display an inspiring quote');

Some files were not shown because too many files have changed in this diff Show More