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

Compare commits

base: deon:f60727f5fb1b771eb8d92ad8e5492a5619ef8f9e
Branches Tags
deon:master
deon:test
..
compare: deon:2e9f87550c44337e3eff6078398f9d483ea85295
Branches Tags
deon:master
deon:test

No commits in common. "f60727f5fb1b771eb8d92ad8e5492a5619ef8f9e" and "2e9f87550c44337e3eff6078398f9d483ea85295" have entirely different histories.
f60727f5fb ... 2e9f87550c

41 changed files with 931 additions and 842 deletions
Show Stats Expand all files Collapse all files

120
app/Http/Controllers/AdminController.php
View File

@ -3,9 +3,18 @@
namespace App\Http\Controllers;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use App\Http\Requests\SiteEdit;
use App\Models\SiteDetail;
use App\Models\{Account,
Charge,
Invoice,
InvoiceItem,
Payment,
PaymentItem,
Service,
SiteDetail};
/**
* The AdminController governs all routes that are prefixed with 'a/'.
@ -14,6 +23,115 @@ use App\Models\SiteDetail;
*/
class AdminController extends Controller
{
// @todo Move to reseller
public function service(Service $o)
{
return view('theme.backend.adminlte.a.service')
->with('o',$o);
}
/**
* Record payments on an account.
*
* @param Request $request
* @param Payment $o
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|\Illuminate\Http\RedirectResponse
*/
// @todo Move to reseller
public function pay_addedit(Request $request,Payment $o)
{
if ($request->post()) {
$validation = $request->validate([
'account_id' => 'required|exists:accounts,id',
'paid_at' => 'required|date',
'checkout_id' => 'required|exists:checkouts,id',
'total_amt' => 'required|numeric|min:0.01',
'fees_amt' => 'nullable|numeric|lt:total_amt',
'source_id' => 'nullable|exists:accounts,id',
'pending' => 'nullable|boolean',
'notes' => 'nullable|string',
'ip' => 'nullable|ip',
'invoices' => ['required','array',function ($attribute,$value,$fail) use ($request) {
if (collect($value)->sum('id') > $request->post('total_amt'))
$fail('Allocation is greater than payment total.');
}],
'invoices.*.id' => ['required',function ($attribute,$value,$fail) {
if (! Invoice::exists(str_replace(str_replace($attribute,'invoice\.','',),'.id','')))
$fail('Invoice doesnt exist in DB');
}],
]);
if (! $o->exists) {
$o->site_id = config('site')->site_id;
$o->active = TRUE;
}
$o->forceFill($request->only(['account_id','paid_at','checkout_id','total_amt','fees_amt','source_id','pending','notes','ip']));
$o->save();
foreach ($validation['invoices'] as $id => $amount) {
// See if we already have a payment item that we need to update
$items = $o->items->filter(function($item) use ($id) { return $item->invoice_id == $id; });
if ($items->count() == 1) {
$oo = $items->pop();
if ($amount['id'] == 0) {
$oo->delete();
continue;
}
} else {
$oo = new PaymentItem;
$oo->invoice_id = $id;
}
$oo->amount = ($oo->invoice->due >= 0) && ($oo->invoice->due-$amount['id'] >= 0) ? $amount['id'] : 0;
// If the amount is empty, ignore it.
if (! $oo->amount)
continue;
$oo->site_id = config('site')->site_id;
$oo->active = TRUE;
$o->items()->save($oo);
}
return redirect()
->back()
->with('success','Payment recorded: '.$o->id);
}
return view('theme.backend.adminlte.a.payment.addedit')
->with('o',$o);
}
/**
* List unapplied payments
*
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
*/
// @todo Move to reseller
public function pay_unapplied()
{
return view('theme.backend.adminlte.a.payment.unapplied');
}
/**
* Show a list of invoices to apply payments to
*
* @param Request $request
* @param Account $o
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View
*/
// @todo Move to reseller
public function pay_invoices(Request $request,Account $o)
{
return view('theme.backend.adminlte.a.payment.widgets.invoices')
->with('pid',$request->pid)
->with('o',$o);
}
/**
* Site setup
*

91
app/Http/Controllers/CheckoutController.php
View File

@ -2,8 +2,8 @@
namespace App\Http\Controllers;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\View\View;
use App\Http\Requests\CheckoutAddEdit;
use App\Models\{Checkout,Invoice};
@ -11,84 +11,75 @@ use App\Models\{Checkout,Invoice};
class CheckoutController extends Controller
{
/**
* Update a checkout details
* Update a suppliers details
*
* @param CheckoutAddEdit $request
* @param Checkout $o
* @return RedirectResponse
* @return \Illuminate\Contracts\Foundation\Application|\Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|\Illuminate\Http\RedirectResponse
*/
public function addedit(CheckoutAddEdit $request,Checkout $o): RedirectResponse
public function addedit(CheckoutAddEdit $request,Checkout $o)
{
foreach ($request->validated() as $key => $item)
$this->middleware(['auth','wholesaler']);
foreach ($request->except(['_token','active','submit']) as $key => $item)
$o->{$key} = $item;
$o->active = (bool)$request->validated('active',FALSE);
$o->active = (bool)$request->active;
try {
$o->save();
} catch (\Exception $e) {
return redirect()->back()->withErrors($e->getMessage())->withInput();
}
return redirect()
->back()
->withErrors($e->getMessage())->withInput();
->with('success','Payment saved');
}
return $o->wasRecentlyCreated
? redirect()
->to('a/checkout/'.$o->id)
->with('success','Checkout added')
: redirect()
->back()
->with('success','Checkout saved');
}
/**
* Add an invoice to the cart
*
* @param Request $request
* @param Invoice $o
* @return \Illuminate\Contracts\View\Factory|\Illuminate\Contracts\View\View|\Illuminate\Foundation\Application
* @note The route validates that the user can see the invoice
*/
public function cart_invoice(Request $request,Invoice $o)
public function cart_invoice(Request $request,Invoice $o=NULL)
{
if ($o) {
$request->session()->put('invoice.cart.'.$o->id,$o->id);
}
return view('theme.backend.adminlte.checkout.cart');
if (! $request->session()->get('invoice.cart'))
return redirect()
->to('u/home');
return view('theme.backend.adminlte.u.invoice.cart')
->with('invoices',Invoice::find(array_values($request->session()->get('invoice.cart'))));
}
public function fee(Request $request,Checkout $o): float
{
return $o->fee($request->post('total',0));
}
/**
* Remove an item from the cart
* Render a specific invoice for the user
*
* @param Request $request
* @return string
* @return View
*/
public function cart_remove(Request $request): string
public function home(): View
{
if ($id=$request->post('id')) {
$cart = $request->session()->pull('invoice.cart');
unset($cart[$id]);
$request->session()->put('invoice.cart',$cart);
return view('theme.backend.adminlte.payment.home');
}
return '';
public function pay(Request $request,Checkout $o)
{
return redirect('pay/paypal/authorise');
}
public function fee(Request $request): float
/**
* View details on a specific payment method
*
* @param Checkout $o
* @return View
*/
public function view(Checkout $o): View
{
if ((! $request->post('checkout_id') || (! $request->post('total'))))
return 0;
$co = Checkout::findOrFail($request->post('checkout_id'));
return $co->fee($request->post('total'));
}
public function pay()
{
// @todo Currently sending all payments to paypal
return redirect()
->action([PaypalController::class,'authorise']);
return view('theme.backend.adminlte.payment.view',['o'=>$o]);
}
}

18
app/Http/Controllers/InvoiceController.php
View File

@ -4,11 +4,10 @@ namespace App\Http\Controllers;
use Clarkeash\Doorman\Exceptions\{ExpiredInviteCode,InvalidInviteCode,NotYourInviteCode};
use Clarkeash\Doorman\Facades\Doorman;
use Illuminate\Http\Request;
use Illuminate\View\View;
use Barryvdh\Snappy\Facades\SnappyPdf as PDF;
use App\Models\{Account,Invoice};
use App\Models\Invoice;
/**
* Class InvoiceController
@ -20,21 +19,6 @@ use App\Models\{Account,Invoice};
*/
class InvoiceController extends Controller
{
/**
* Show a list of invoices to apply payments to
*
* @param Request $request
* @return \Illuminate\Contracts\View\View
*/
public function api_account_invoices(Request $request): \Illuminate\Contracts\View\View
{
session()->flashInput($request->post('old',[]));
return view('theme.backend.adminlte.payment.widget.invoices')
->with('pid',$request->post('pid'))
->with('o',Account::findOrFail($request->post('aid')));
}
/**
* Return the invoice in PDF format, ready to download
*

73
app/Http/Controllers/PaymentController.php
View File

@ -1,73 +0,0 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\RedirectResponse;
use Illuminate\Support\Arr;
use App\Http\Requests\PaymentAddEdit;
use App\Models\{Payment,PaymentItem};
class PaymentController extends Controller
{
/**
* Record payments on an account.
*
* @param PaymentAddEdit $request
* @param Payment $o
* @return RedirectResponse
*/
public function addedit(PaymentAddEdit $request,Payment $o): RedirectResponse
{
foreach (Arr::except($request->validated(),'invoices') as $k=>$v)
$o->{$k} = $v;
foreach ($request->validated('invoices',[]) as $id => $amount) {
// See if we already have a payment item that we need to update
$items = $o->items
->filter(fn($item)=>$item->invoice_id == $id);
if ($items->count() === 1) {
$oo = $items->pop();
if ($amount == 0) {
$oo->delete();
continue;
}
} else {
$oo = new PaymentItem;
$oo->invoice_id = $id;
}
$oo->amount = ($oo->invoice->due >= 0) && ($oo->invoice->due-$amount >= 0)
? $amount
: 0;
// If the amount is empty, ignore it.
if (! $oo->amount)
continue;
$oo->site_id = config('site')->site_id;
$oo->active = TRUE;
$o->items->push($oo);
}
try {
$o->pushNew();
} catch (\Exception $e) {
return redirect()
->back()
->withErrors($e->getMessage())->withInput();
}
return $o->wasRecentlyCreated
? redirect()
->to('r/payment/'.$o->id)
->with('success','Payment added')
: redirect()
->back()
->with('success','Payment saved');
}
}

84
app/Http/Controllers/PaypalController.php
View File

@ -2,8 +2,8 @@
namespace App\Http\Controllers;
use App\Models\PaymentItem;
use Carbon\Carbon;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
use PayPalCheckoutSdk\Core\PayPalHttpClient;
@ -13,13 +13,14 @@ use PayPalCheckoutSdk\Orders\OrdersCreateRequest;
use PayPalCheckoutSdk\Orders\OrdersCaptureRequest;
use PayPalHttp\HttpException;
use App\Models\{Checkout,Invoice,Payment,PaymentItem};
use App\Models\Checkout;
use App\Models\Invoice;
use App\Models\Payment;
class PaypalController extends Controller
{
private PayPalHttpClient $client;
protected const cart_url = 'u/checkout/cart';
private $client;
private $o = NULL;
// Create a new instance with our paypal credentials
public function __construct()
@ -30,30 +31,27 @@ class PaypalController extends Controller
$environment = new ProductionEnvironment(config('paypal.live_client_id'),config('paypal.live_secret'));
$this->client = new PayPalHttpClient($environment);
$this->o = Checkout::where('name','paypal')->firstOrFail();
}
public function cancel()
public function cancel(Request $request)
{
return redirect()
->to(self::cart_url);
return redirect()->to('u/invoice/cart');
}
/**
* Authorize a paypal payment, and redirect the user to pay.
*
* @return RedirectResponse
* @throws \PayPalHttp\IOException
* @param Request $request
* @return \Illuminate\Http\RedirectResponse
*/
public function authorise()
public function authorise(Request $request)
{
$co = Checkout::where('name','ilike','paypal')->firstOrFail();
$currency = 'AUD'; // @todo TO determine from DB.;
$cart = request()->session()->get('invoice.cart');
$cart = $request->session()->get('invoice.cart');
if (! $cart)
return redirect()
->to('u/home');
return redirect()->to('u/home');
$invoices = Invoice::find($cart);
@ -63,7 +61,7 @@ class PaypalController extends Controller
// Paypal Purchase Units
$items = collect();
foreach ($invoices as $io) {
$fee = $co->fee($io->due,count($cart));
$fee = $this->o->fee($io->due,count($cart));
$total = round($io->due+$fee,2);
$items->push([
@ -102,7 +100,7 @@ class PaypalController extends Controller
$data->put('application_context',[
'return_url' => url('pay/paypal/capture'),
'cancel_url' => url(self::cart_url),
'cancel_url' => url('u/invoice/cart'),
]);
$paypal->body = $data->toArray();
@ -113,16 +111,12 @@ class PaypalController extends Controller
} catch (HttpException $e) {
Log::error('Paypal Exception',['request'=>$paypal,'response'=>$e->getMessage()]);
return redirect()
->to(self::cart_url)
->withErrors('Paypal Exception: '.$e->getCode());
return redirect()->to('u/invoice/cart')->withErrors('Paypal Exception: '.$e->getCode());
} catch (\HttpException $e) {
Log::error('HTTP Exception',['request'=>$this->client,'response'=>$e->getMessage()]);
Log::error('HTTP Exception',['request'=>$request,'response'=>$e->getMessage()]);
return redirect()
->to(self::cart_url)
->withErrors('HTTP Exception: '.$e->getCode());
return redirect()->to('u/invoice/cart')->withErrors('HTTP Exception: '.$e->getCode());
}
// Get the approval link
@ -134,21 +128,18 @@ class PaypalController extends Controller
}
}
if ($redirect_url)
return redirect()
->away($redirect_url);
if ($redirect_url) {
return redirect()->away($redirect_url);
}
return redirect()
->to(self::cart_url)
->withErrors('An error occurred with Paypal?');
return redirect()->to('u/invoice/cart')->withErrors('An error occurred with Paypal?');
}
/**
* Capture a paypal payment
*
* @param Request $request
* @return RedirectResponse
* @throws \PayPalHttp\IOException
* @return \Illuminate\Http\RedirectResponse
*/
public function capture(Request $request)
{
@ -188,32 +179,23 @@ class PaypalController extends Controller
if ($redirect_url) {
Log::error('Paypal Capture: Redirect back to Paypal.');
return redirect()
->away($redirect_url);
return redirect()->away($redirect_url);
}
return redirect()
->to(self::cart_url)
->withErrors('An error occurred with Paypal?');
return redirect()->to('u/invoice/cart')->withErrors('An error occurred with Paypal?');
} catch (\HttpException $e) {
Log::error('HTTP Exception',['request'=>$paypal,'response'=>$e->getMessage()]);
return redirect()
->to(self::cart_url)
->withErrors('HTTP Exception: '.$e->getCode());
return redirect()->to('u/invoice/cart')->withErrors('HTTP Exception: '.$e->getCode());
}
if ((! $response) || (! $response->result->purchase_units)) {
if (! $response OR ! $response->result->purchase_units) {
Log::error('Paypal Capture: No Purchase Units?');
return redirect()
->to(self::cart_url)
->withErrors('Paypal Exception: NPU');
return redirect()->to('u/invoice/cart')->withErrors('Paypal Exception: NPU');
}
$co = Checkout::where('name','ilike','paypal')->firstOrFail();
// If we got here, we got a payment
foreach ($response->result->purchase_units as $pu) {
foreach ($pu->payments->captures as $cap) {
@ -237,7 +219,7 @@ class PaypalController extends Controller
}
$po->paid_at = Carbon::parse($cap->create_time);
$po->checkout_id = $co->id;
$po->checkout_id = $this->o->id;
$po->checkout_data = $cap->id;
list($account_id,$fee) = explode(':',$cap->custom_id);
@ -264,11 +246,7 @@ class PaypalController extends Controller
}
$request->session()->forget('invoice.cart');
Log::info('Paypal Payment Recorded',['po'=>$po->id]);
return redirect()
->to('u/home')
->with('success','Payment recorded thank you.');
return redirect()->to('u/home')->with('success','Payment recorded thank you.');
}
}

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

@ -90,7 +90,7 @@ class SearchController extends Controller
->whereIN('account_id',$account_ids)
->limit(10)->get() as $o)
{
$result->push(['name'=>sprintf('%s: %s $%s',$o->lid,$o->account->name,number_format($o->total,2)),'value'=>'/r/payment/addedit/'.$o->id,'category'=>'Payments']);
$result->push(['name'=>sprintf('%s: %s $%s',$o->lid,$o->account->name,number_format($o->total,2)),'value'=>'/a/payment/addedit/'.$o->id,'category'=>'Payments']);
}
}

13
app/Http/Requests/CheckoutAddEdit.php
View File

@ -3,8 +3,7 @@
namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Gate;
use Illuminate\Validation\Rule;
use Illuminate\Support\Facades\Auth;
/**
* Editing Suppliers
@ -18,7 +17,7 @@ class CheckoutAddEdit extends FormRequest
*/
public function authorize()
{
return Gate::allows('wholesaler');
return Auth::user()->isWholesaler();
}
/**
@ -29,13 +28,7 @@ class CheckoutAddEdit extends FormRequest
public function rules()
{
return [
'name' => [
'required',
'string',
'min:2',
'max:255',
Rule::unique('checkouts','name')->ignore($this->route('o')?->id),
],
'name' => 'required|string|min:2|max:255',
'active' => 'sometimes|accepted',
'description' => 'nullable|string|min:2|max:255',
];

62
app/Http/Requests/PaymentAddEdit.php
View File

@ -1,62 +0,0 @@
<?php
namespace App\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Gate;
use App\Models\Invoice;
/**
* Editing Suppliers
*/
class PaymentAddEdit extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize()
{
return Gate::allows('wholesaler');
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, mixed>
*/
public function rules()
{
return [
'account_id' => 'required|exists:accounts,id',
'paid_at' => 'required|date',
'checkout_id' => 'required|exists:checkouts,id',
'total_amt' => 'required|numeric|min:0.01',
'fees_amt' => 'nullable|numeric|lt:total_amt',
'source_id' => 'nullable|exists:accounts,id',
'pending' => 'nullable|boolean',
'notes' => 'nullable|string',
'ip' => 'nullable|ip',
'invoices' => [
'nullable',
'array',
function($attribute,$value,$fail) {
if (($x=collect($value)->sum()) > request()->post('total_amt'))
$fail(sprintf('Allocation %3.2f is greater than payment total %3.2f.',$x,request()->post('total_amt')));
}
],
'invoices.*' => [
'nullable',
function($attribute,$value,$fail) {
if (! ($x=Invoice::where('id',$xx=str_replace('invoices.','',$attribute))->first()))
$fail(sprintf('Invoice [%d] doesnt exist in DB',$xx));
// @todo The due amount may be influenced by this payment (ie: payment edit)
elseif($x->due < $value)
$fail(sprintf('Invoice [%d] is over allocated by %3.2f',$x->id,$value-$x->due));
}
],
];
}
}

4
app/Models/Checkout.php
View File

@ -6,11 +6,9 @@ use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model;
use Leenooks\Traits\ScopeActive;
use App\Traits\SiteID;
class Checkout extends Model
{
use ScopeActive,SiteID;
use ScopeActive;
protected $casts = [
'plugin_data'=>'json',

5
app/Models/Invoice.php
View File

@ -300,7 +300,8 @@ class Invoice extends Model implements IDs
/**
* @param \Leenooks\Carbon $start Start Date
* @param Carbon $end End Date
* @param Collection $period
* @param int $interval Period End Date
* @param bool $strict
* @return float
* @throws \Exception
*/
@ -372,7 +373,7 @@ class Invoice extends Model implements IDs
public function payments()
{
return $this->hasManyThrough(Payment::class,PaymentItem::class,NULL,'id',NULL,'payment_id')
->where('payments.active',TRUE);
->where('active',TRUE);
}
/**

7
app/Models/Payment.php
View File

@ -7,7 +7,8 @@ use Illuminate\Support\Facades\DB;
use Leenooks\Traits\ScopeActive;
use App\Interfaces\IDs;
use App\Traits\{ProviderRef,PushNew,SiteID};
use App\Traits\ProviderRef;
use App\Traits\PushNew;
/**
* Class Payment
@ -24,7 +25,7 @@ use App\Traits\{ProviderRef,PushNew,SiteID};
*/
class Payment extends Model implements IDs
{
use PushNew,ScopeActive,ProviderRef,SiteID;
use PushNew,ScopeActive,ProviderRef;
protected $casts = [
'paid_at'=>'datetime:Y-m-d',
@ -105,7 +106,7 @@ class Payment extends Model implements IDs
->select(['payments.id','paid_at','account_id','checkout_id','total_amt',DB::raw("SUM(ABS(amount)) as allocated")])
->leftJoin('payment_items',['payment_items.payment_id'=>'payments.id'])
->groupBy(['payments.id','paid_at','total_amt','account_id','checkout_id'])
->having(DB::raw('ROUND(CAST(total_amt-COALESCE(SUM(ABS(amount)),0) AS NUMERIC),2)'),'>',self::threshold);
->having(DB::raw('ROUND(total_amt-IFNULL(allocated,0),2)'),'>',self::threshold);
}
/* ATTRIBUTES */

105
composer.lock generated
View File

@ -1534,16 +1534,16 @@
},
{
"name": "laravel/framework",
"version": "v11.20.0",
"version": "v11.19.0",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "3cd7593dd9b67002fc416b46616f4d4d1da3e571"
"reference": "5e103d499e9ee5bcfc184412d034c4e516b87085"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/3cd7593dd9b67002fc416b46616f4d4d1da3e571",
"reference": "3cd7593dd9b67002fc416b46616f4d4d1da3e571",
"url": "https://api.github.com/repos/laravel/framework/zipball/5e103d499e9ee5bcfc184412d034c4e516b87085",
"reference": "5e103d499e9ee5bcfc184412d034c4e516b87085",
"shasum": ""
},
"require": {
@ -1736,7 +1736,7 @@
"issues": "https://github.com/laravel/framework/issues",
"source": "https://github.com/laravel/framework"
},
"time": "2024-08-06T14:39:21+00:00"
"time": "2024-07-30T15:22:41+00:00"
},
{
"name": "laravel/intuit",
@ -1777,16 +1777,16 @@
},
{
"name": "laravel/passport",
"version": "v12.3.0",
"version": "v12.2.1",
"source": {
"type": "git",
"url": "https://github.com/laravel/passport.git",
"reference": "ca63a86697a4fa091c7dcabe88ebba91d97c785d"
"reference": "795bbb406c8f10167df6062032de803bd7d686f2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/passport/zipball/ca63a86697a4fa091c7dcabe88ebba91d97c785d",
"reference": "ca63a86697a4fa091c7dcabe88ebba91d97c785d",
"url": "https://api.github.com/repos/laravel/passport/zipball/795bbb406c8f10167df6062032de803bd7d686f2",
"reference": "795bbb406c8f10167df6062032de803bd7d686f2",
"shasum": ""
},
"require": {
@ -1849,7 +1849,7 @@
"issues": "https://github.com/laravel/passport/issues",
"source": "https://github.com/laravel/passport"
},
"time": "2024-08-05T13:44:51+00:00"
"time": "2024-07-10T19:25:36+00:00"
},
{
"name": "laravel/prompts",
@ -1911,27 +1911,26 @@
},
{
"name": "laravel/serializable-closure",
"version": "v1.3.4",
"version": "v1.3.3",
"source": {
"type": "git",
"url": "https://github.com/laravel/serializable-closure.git",
"reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81"
"reference": "3dbf8a8e914634c48d389c1234552666b3d43754"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/61b87392d986dc49ad5ef64e75b1ff5fee24ef81",
"reference": "61b87392d986dc49ad5ef64e75b1ff5fee24ef81",
"url": "https://api.github.com/repos/laravel/serializable-closure/zipball/3dbf8a8e914634c48d389c1234552666b3d43754",
"reference": "3dbf8a8e914634c48d389c1234552666b3d43754",
"shasum": ""
},
"require": {
"php": "^7.3|^8.0"
},
"require-dev": {
"illuminate/support": "^8.0|^9.0|^10.0|^11.0",
"nesbot/carbon": "^2.61|^3.0",
"nesbot/carbon": "^2.61",
"pestphp/pest": "^1.21.3",
"phpstan/phpstan": "^1.8.2",
"symfony/var-dumper": "^5.4.11|^6.2.0|^7.0.0"
"symfony/var-dumper": "^5.4.11"
},
"type": "library",
"extra": {
@ -1968,7 +1967,7 @@
"issues": "https://github.com/laravel/serializable-closure/issues",
"source": "https://github.com/laravel/serializable-closure"
},
"time": "2024-08-02T07:48:17+00:00"
"time": "2023-11-08T14:08:06+00:00"
},
{
"name": "laravel/socialite",
@ -3057,11 +3056,11 @@
},
{
"name": "leenooks/laravel",
"version": "11.1.10",
"version": "11.1.9",
"source": {
"type": "git",
"url": "https://gitea.dege.au/laravel/leenooks.git",
"reference": "92dd7ac3cb6598e55af3cbc95d9cf7af44318a30"
"reference": "293d9913c65143f00e3051bff32d15c97644bd15"
},
"type": "library",
"extra": {
@ -3094,7 +3093,7 @@
"laravel",
"leenooks"
],
"time": "2024-08-10T12:25:03+00:00"
"time": "2024-08-01T07:32:20+00:00"
},
{
"name": "leenooks/passkey",
@ -3475,20 +3474,20 @@
},
{
"name": "nette/utils",
"version": "v4.0.5",
"version": "v4.0.4",
"source": {
"type": "git",
"url": "https://github.com/nette/utils.git",
"reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96"
"reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nette/utils/zipball/736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
"reference": "736c567e257dbe0fcf6ce81b4d6dbe05c6899f96",
"url": "https://api.github.com/repos/nette/utils/zipball/d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
"reference": "d3ad0aa3b9f934602cb3e3902ebccf10be34d218",
"shasum": ""
},
"require": {
"php": "8.0 - 8.4"
"php": ">=8.0 <8.4"
},
"conflict": {
"nette/finder": "<3",
@ -3555,9 +3554,9 @@
],
"support": {
"issues": "https://github.com/nette/utils/issues",
"source": "https://github.com/nette/utils/tree/v4.0.5"
"source": "https://github.com/nette/utils/tree/v4.0.4"
},
"time": "2024-08-07T15:39:19+00:00"
"time": "2024-01-17T16:50:36+00:00"
},
{
"name": "nunomaduro/termwind",
@ -8372,23 +8371,23 @@
},
{
"name": "nunomaduro/collision",
"version": "v8.4.0",
"version": "v8.3.0",
"source": {
"type": "git",
"url": "https://github.com/nunomaduro/collision.git",
"reference": "e7d1aa8ed753f63fa816932bbc89678238843b4a"
"reference": "b49f5b2891ce52726adfd162841c69d4e4c84229"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/e7d1aa8ed753f63fa816932bbc89678238843b4a",
"reference": "e7d1aa8ed753f63fa816932bbc89678238843b4a",
"url": "https://api.github.com/repos/nunomaduro/collision/zipball/b49f5b2891ce52726adfd162841c69d4e4c84229",
"reference": "b49f5b2891ce52726adfd162841c69d4e4c84229",
"shasum": ""
},
"require": {
"filp/whoops": "^2.15.4",
"nunomaduro/termwind": "^2.0.1",
"php": "^8.2.0",
"symfony/console": "^7.1.3"
"symfony/console": "^7.1.2"
},
"conflict": {
"laravel/framework": "<11.0.0 || >=12.0.0",
@ -8396,13 +8395,13 @@
},
"require-dev": {
"larastan/larastan": "^2.9.8",
"laravel/framework": "^11.19.0",
"laravel/pint": "^1.17.1",
"laravel/sail": "^1.31.0",
"laravel/framework": "^11.16.0",
"laravel/pint": "^1.16.2",
"laravel/sail": "^1.30.2",
"laravel/sanctum": "^4.0.2",
"laravel/tinker": "^2.9.0",
"orchestra/testbench-core": "^9.2.3",
"pestphp/pest": "^2.35.0 || ^3.0.0",
"orchestra/testbench-core": "^9.2.1",
"pestphp/pest": "^2.34.9 || ^3.0.0",
"sebastian/environment": "^6.1.0 || ^7.0.0"
},
"type": "library",
@ -8465,7 +8464,7 @@
"type": "patreon"
}
],
"time": "2024-08-03T15:32:23+00:00"
"time": "2024-07-16T22:41:01+00:00"
},
{
"name": "phar-io/manifest",
@ -8910,16 +8909,16 @@
},
{
"name": "phpunit/phpunit",
"version": "11.3.0",
"version": "11.2.9",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "a8dce73a8938dfec7ac0daa91bdbcaae7d7188a3"
"reference": "c197bbaaca360efda351369bf1fd9cc1ca6bcbf7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/a8dce73a8938dfec7ac0daa91bdbcaae7d7188a3",
"reference": "a8dce73a8938dfec7ac0daa91bdbcaae7d7188a3",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/c197bbaaca360efda351369bf1fd9cc1ca6bcbf7",
"reference": "c197bbaaca360efda351369bf1fd9cc1ca6bcbf7",
"shasum": ""
},
"require": {
@ -8958,7 +8957,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-main": "11.3-dev"
"dev-main": "11.2-dev"
}
},
"autoload": {
@ -8990,7 +8989,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
"source": "https://github.com/sebastianbergmann/phpunit/tree/11.3.0"
"source": "https://github.com/sebastianbergmann/phpunit/tree/11.2.9"
},
"funding": [
{
@ -9006,7 +9005,7 @@
"type": "tidelift"
}
],
"time": "2024-08-02T03:56:43+00:00"
"time": "2024-07-30T11:09:23+00:00"
},
{
"name": "sebastian/cli-parser",
@ -10070,16 +10069,16 @@
},
{
"name": "spatie/flare-client-php",
"version": "1.8.0",
"version": "1.7.0",
"source": {
"type": "git",
"url": "https://github.com/spatie/flare-client-php.git",
"reference": "180f8ca4c0d0d6fc51477bd8c53ce37ab5a96122"
"reference": "097040ff51e660e0f6fc863684ac4b02c93fa234"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/spatie/flare-client-php/zipball/180f8ca4c0d0d6fc51477bd8c53ce37ab5a96122",
"reference": "180f8ca4c0d0d6fc51477bd8c53ce37ab5a96122",
"url": "https://api.github.com/repos/spatie/flare-client-php/zipball/097040ff51e660e0f6fc863684ac4b02c93fa234",
"reference": "097040ff51e660e0f6fc863684ac4b02c93fa234",
"shasum": ""
},
"require": {
@ -10097,7 +10096,7 @@
"phpstan/extension-installer": "^1.1",
"phpstan/phpstan-deprecation-rules": "^1.0",
"phpstan/phpstan-phpunit": "^1.0",
"spatie/pest-plugin-snapshots": "^1.0|^2.0"
"spatie/phpunit-snapshot-assertions": "^4.0|^5.0"
},
"type": "library",
"extra": {
@ -10127,7 +10126,7 @@
],
"support": {
"issues": "https://github.com/spatie/flare-client-php/issues",
"source": "https://github.com/spatie/flare-client-php/tree/1.8.0"
"source": "https://github.com/spatie/flare-client-php/tree/1.7.0"
},
"funding": [
{
@ -10135,7 +10134,7 @@
"type": "github"
}
],
"time": "2024-08-01T08:27:26+00:00"
"time": "2024-06-12T14:39:14+00:00"
},
{
"name": "spatie/ignition",

11
public/css/fixes.css vendored
View File

@ -84,17 +84,8 @@ span.select2-selection.select2-selection--single > span.select2-selection__rende
width: 100%;
}
/* Render the invalid red when a select container fails vlidation */
/* Render the invalid red when a select container fails validation */
.is-invalid + .select2-container--default .select2-selection--single,
.is-invalid + .select2-container--default .select2-selection--multiple {
border: 1px solid #dc3545;
}
/* When we have a hr after h3, show the line directly under the h3 */
h3:has(+hr) {
margin-bottom: 0;
}
h3 + hr {
margin-top: 0;
margin-bottom: 2em;
}

BIN
public/pages/welcome/img/activity/edplus.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 310 KiB

After

Width:  |  Height:  |  Size: 1.0 MiB

BIN
public/pages/welcome/img/activity/elonera.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 181 KiB

After

Width:  |  Height:  |  Size: 2.5 MiB

BIN
public/pages/welcome/img/activity/email.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 186 KiB

BIN
public/pages/welcome/img/activity/graytech.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 98 KiB

After

Width:  |  Height:  |  Size: 1.9 MiB

BIN
public/pages/welcome/img/activity/graytech1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 122 KiB

After

Width:  |  Height:  |  Size: 848 KiB

BIN
public/pages/welcome/img/activity/pla.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 183 KiB

BIN
public/pages/welcome/img/activity/voip.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 73 KiB

After

Width:  |  Height:  |  Size: 1.7 MiB

BIN
public/pages/welcome/img/activity/whiskywholesale.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 617 KiB

BIN
public/pages/welcome/img/slider/binary-2907220_1920.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 168 KiB

After

Width:  |  Height:  |  Size: 222 KiB

BIN
public/pages/welcome/img/slider/ipad-820272_1920.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 264 KiB

After

Width:  |  Height:  |  Size: 442 KiB

BIN
public/pages/welcome/img/slider/mobile-phone-426559_1920.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 436 KiB

After

Width:  |  Height:  |  Size: 1.1 MiB

254
resources/views/theme/backend/adminlte/a/payment/addedit.blade.php Normal file
View File

@ -0,0 +1,254 @@
@extends('adminlte::layouts.app')
@section('htmlheader_title')
Payment
@endsection
@section('page_title')
Payment
@endsection
@section('contentheader_title')
Record Payment
@endsection
@section('contentheader_description')
@endsection
@section('main-content')
<div class="row">
<div class="col-6">
<div class="card card-dark">
<div class="card-header">
<h1 class="card-title">Record Payment</h1>
@if(session()->has('success'))
<span class="ml-3 pt-0 pb-0 pr-1 pl-1 btn btn-outline-success"><small>{{ session()->get('success') }}</small></span>
@endif
</div>
<div class="card-body">
<form class="g-0 needs-validation" method="POST" role="form">
@csrf
<div class="row">
<!-- DATE RECEIVED -->
<div class="col-4">
<div class="form-group has-validation">
<label for="paid_at">Date Received</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-fw fa-calendar"></i></span>
</div>
<input type="date" class="form-control @error('paid_at') is-invalid @enderror" id="paid_at" name="paid_at" value="{{ old('paid_at',($o->exists ? $o->paid_at : \Carbon\Carbon::now())->format('Y-m-d')) }}" required>
<span class="invalid-feedback" role="alert">
@error('paid_at')
{{ $message }}
@else
Payment Date is required.
@enderror
</span>
</div>
<span class="input-helper">Date Payment Received.</span>
</div>
</div>
<!-- AMOUNT -->
<div class="offset-4 col-4">
<div class="form-group has-validation">
<label for="total_amt">Amount</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-fw fa-dollar-sign"></i></span>
</div>
<input type="text" class="text-right form-control @error('total_amt') is-invalid @enderror" id="total_amt" name="total_amt" value="{{ number_format(old('total_amt',$o->exists ? $o->total_amt : 0),2) }}" required>
<span class="invalid-feedback" role="alert">
@error('total_amt')
{{ $message }}
@else
Payment Amount is required.
@enderror
</span>
</div>
<span class="input-helper">Amount Received.</span>
</div>
</div>
</div>
<div class="row">
<!-- METHOD -->
<div class="col-4">
<div class="form-group has-validation">
<label for="checkout_id">Payment Method</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-fw fa-dollar-sign"></i></span>
</div>
<select class="form-control @error('checkout_id') is-invalid @enderror" id="checkout_id" name="checkout_id" required>
<option value=""></option>
@foreach (\App\Models\Checkout::orderBy('name')->get() as $co)
<option value="{{ $co->id }}" {{ $co->id == old('checkout_id',$o->exists ? $o->checkout_id : NULL) ? 'selected' : '' }}>{{ $co->name }}</option>
@endforeach
</select>
<span class="invalid-feedback" role="alert">
@error('checkout_id')
{{ $message }}
@else
Payment Method is required.
@enderror
</span>
</div>
<span class="input-helper">Payment Method.</span>
</div>
</div>
<!-- PAYMENT FEE -->
<div class="offset-4 col-4">
<div class="form-group has-validation">
<label for="fees_amt">Fee</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-fw fa-dollar-sign"></i></span>
</div>
<input type="text" class="text-right form-control @error('fees_amt') is-invalid @enderror" id="fees_amt" name="fees_amt" value="{{ number_format(old('fees_amt',$o->exists ? $o->fees_amt : 0),2) }}">
<span class="invalid-feedback" role="alert">
@error('fees_amt')
{{ $message }}
@else
Total Fees is required.
@enderror
</span>
</div>
<span class="input-helper">Amount Received.</span>
</div>
</div>
</div>
<div class="row">
<!-- ACCOUNT -->
<div class="col-6">
<div class="form-group has-validation">
<label for="account_id">Account</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-fw fa-user"></i></span>
</div>
<!-- @todo Only show active accounts or accounts with outstanding invoices -->
<select class="form-control @error('account_id') is-invalid @enderror" id="account_id" name="account_id" required>
<option value=""></option>
@foreach (\App\Models\Account::active()->with(['user'])->get()->sortBy('name') as $ao)
<option value="{{ $ao->id }}" {{ $ao->id == old('account_id',$o->exists ? $o->account_id : NULL) ? 'selected' : '' }}>{{ $ao->name }}</option>
@endforeach
</select>
<span class="invalid-feedback" role="alert">
@error('account_id')
{{ $message }}
@else
Account is required.
@enderror
</span>
</div>
<span class="input-helper">Account to add payment to.</span>
<i class="fas fa-spinner d-none"></i>
</div>
</div>
<!-- BALANCE -->
<div class="offset-2 col-4">
<label for="fees_amt">Balance</label>
<div class="input-group">
<div class="input-group-prepend">
<span class="input-group-text"><i class="fas fa-fw fa-dollar-sign"></i></span>
</div>
<input type="text" class="text-right form-control @error('fees_amt') is-invalid @enderror" id="balance" value="{{ number_format($o->exists ? $o->balance : 0,2) }}" disabled>
</div>
</div>
</div>
<div class="row mt-3 mb-3">
<div class="col-12">
<div id="invoices"></div>
@error('invoices')
<span class="invalid-feedback d-block mt-2 mb-2" role="alert">
{{ $message }}
</span>
@enderror
</div>
</div>
<div class="row">
<div class="col-12">
<a href="{{ url('/home') }}" class="btn btn-danger">Cancel</a>
@can('wholesaler')
<button type="submit" name="submit" class="btn btn-success mr-0 float-right">@if ($site->exists)Save @else Add @endif</button>
@endcan
</div>
</div>
</form>
</div>
</div>
</div>
</div>
@endsection
@section('page-scripts')
@css(select2)
@js(select2,autofocus)
<script type="text/javascript">
function populate(account,spinner) {
spinner.toggleClass('d-none').toggleClass('fa-spin');
$.ajax({
type: 'POST',
dataType: 'html',
cache: false,
url: '{{ url('api/r/invoices') }}'+'/'+account,
data: {pid:{{ $o->id ?: 'null' }}},
timeout: 2000,
error: function(x) {
spinner.toggleClass('d-none').toggleClass('fa-spin');
alert('Failed to submit');
},
success: function(data) {
spinner.toggleClass('d-none').toggleClass('fa-spin');
$("div[id=invoices]").empty().append(data);
}
});
}
function balance() {
var alloc = 0;
$('.invoice').each(function() {
alloc += parseFloat($(this).val());
})
$('#balance').val(($('#total_amt').val()-alloc).toFixed(2))
}
$(document).ready(function() {
if ($('#account_id').val()) {
var spinner = $('#account_id').parent().parent().find('i.fas.fa-spinner');
populate($('#account_id').val(),spinner);
}
$('#account_id').select2({
sorter: data => data.sort((a, b) => a.text.localeCompare(b.text)),
})
.on('change',function(e) {
if (! $(this).val()) {
$("div[id=invoices]").empty();
return;
}
var spinner = $(this).parent().parent().find('i.fas.fa-spinner');
populate($(this).val(),spinner);
});
$('#total_amt').on('change',balance);
});
$(document).on('change','.invoice',balance);
</script>
@append

21
resources/views/theme/backend/adminlte/payment/unapplied.blade.php → resources/views/theme/backend/adminlte/a/payment/unapplied.blade.php
View File

@ -1,5 +1,3 @@
@use(App\Models\Payment)
@extends('adminlte::layouts.app')
@section('htmlheader_title')
@ -17,7 +15,7 @@
@section('main-content')
<div class="row">
<div class="col">
<div class="col-6">
<div class="card">
<div class="card-body">
<table class="table table-striped table-hover" id="unapplied_payments">
@ -34,10 +32,10 @@
</thead>
<tbody>
@foreach(Payment::active()->unapplied()->with(['account.user','checkout','items'])->get() as $o)
@continue(! $o->balance)
@foreach(\App\Models\Payment::active()->unapplied()->with(['account.user','checkout','items'])->get() as $o)
@if (! $o->balance) @continue @endif
<tr>
<td><a href="{{ url('r/payment',$o->id) }}">{{ $o->id }}</td>
<td><a href="{{ url('a/payment/addedit',$o->id) }}">{{ $o->id }}</td>
<td>{{ $o->paid_at->format('Y-m-d') }}</td>
<td>{{ $o->account->name }}</td>
<td>{{ $o->checkout->name }}</td>
@ -54,17 +52,14 @@
</div>
@endsection
@pa(datatables,rowgroup|conditionalpaging)
@section('page-scripts')
@css(datatables,bootstrap4)
@js(datatables,bootstrap4)
<script type="text/javascript">
$(document).ready(function() {
$('#unapplied_payments').DataTable({
$('#unapplied_payments').DataTable( {
order: [1,'desc'],
rowGroup: {
dataSrc: 2,
},
conditionalPaging: true,
});
});
</script>

11
resources/views/theme/backend/adminlte/payment/widget/invoices.blade.php → resources/views/theme/backend/adminlte/a/payment/widgets/invoices.blade.php
View File

@ -1,10 +1,9 @@
<!-- $o=Account::class -->
<div>
<label>Invoices Due</label>
<div class="form-group mb-0">
<label for="checkout_id">Invoices Due</label>
@if(($x=$o->invoices()
->active()
->where('active',TRUE)
->orderBy('due_at')
->with(['items.taxes','payments','account'])
->with(['items.taxes','payment_items.payment','account'])
->get()
->filter(function($item) use ($pid) { return $item->due > 0 || $item->payments->search(function($item) use ($pid) { return $item->id == $pid; }) !== FALSE; }))->count())
<table class="table table-hover">
@ -28,7 +27,7 @@
<td>{{ number_format($io->total,2) }}</td>
<td>{{ number_format($io->due,2) }}</td>
<td class="text-right">
<x-leenooks::form.text class="text-right" id="invoices_{{$io->id}}" name="invoices[{{ $io->id }}]" icon="fa-dollar-sign" old="invoices.{{$io->id}}" :value="number_format(($x=$io->payment_items->filter(fn($item)=>$item->payment_id == $pid)) ? $x->sum('amount') : 0,2)"/>
<input type="text" class="text-right invoice" name="invoices[{{ $io->id }}][id]" value="{{ number_format(($x=$io->payment_items->filter(function($item) use ($pid) { return $item->payment_id == $pid; })) ? $x->sum('amount') : 0,2) }}">
</td>
</tr>
@endforeach

71
resources/views/theme/backend/adminlte/a/service.blade.php Normal file
View File

@ -0,0 +1,71 @@
@extends('adminlte::layouts.app')
@section('htmlheader_title')
Service #{{ $o->id }}
@endsection
@section('contentheader_title')
Service #
@endsection
@section('contentheader_description')
{{ $o->service_id }}
@endsection
@section('main-content')
<div class="col-md-12">
<div class="box box-primary">
<form role="form" method="POST" enctype="multipart/form-data">
{{ csrf_field() }}
<div class="box-header with-border">
<h3 class="box-title">Service Information</h3>
</div>
<div class="box-body">
<div class="col-md-3">
@switch($o->order_status)
@case('ORDER-SUBMIT')
@include('theme.backend.adminlte.a.widgets.service.order.submit')
@break
@case('ORDER-HOLD')
@case('ORDER-SENT')
@case('ORDERED')
@include('theme.backend.adminlte.a.widgets.service.order.sent')
@break
@default
@include('theme.backend.adminlte.u.widgets.service.info')
@endswitch
</div>
@if($o->order_status == 'ORDER-REQUEST')
<div class="col-md-3">
@include('theme.backend.adminlte.a.widgets.service_order-request')
</div>
@endif
</div>
<div class="box-footer">
@switch($o->order_status)
@case('ORDER-SUBMIT')
<button type="submit" class="btn btn-info btn-danger" name="action" value="reject">Reject</button>
<button type="submit" class="btn btn-info btn-danger" name="action" value="hold">Hold</button>
<button type="submit" class="btn btn-info btn-warning" name="action" value="approve">Approve</button>
@break;
@case('ORDER-HOLD')
<button type="submit" class="btn btn-info btn-warning" name="action" value="release">Release</button>
@case('ORDER-SENT')
@case('ORDERED')
<button type="submit" class="btn btn-info btn-danger" name="action" value="update_reference">Update</button>
@break;
@endswitch
{{-- <button type="submit" class="btn btn-info" name="action" value="save">Back</button> --}}
</div>
</form>
</div>
</div>
@endsection

0
resources/views/theme/backend/adminlte/setup.blade.php → resources/views/theme/backend/adminlte/a/setup.blade.php
View File

140
resources/views/theme/backend/adminlte/checkout/cart.blade.php
View File

@ -1,140 +0,0 @@
@use(App\Models\Checkout)
@use(App\Models\Invoice)
@extends('adminlte::layouts.app')
@section('htmlheader_title')
Payment Cart
@endsection
@section('page_title')
Payments
@endsection
@section('contentheader_title')
Payment Cart
@endsection
@section('contentheader_description')
@endsection
@section('main-content')
<div class="row">
<div class="col-4">
<div class="card card-dark">
<div class="card-header p-2">
<span class="card-title">Invoices to Pay</span>
</div>
<div class="card-body">
<form method="POST" action="{{ url('u/checkout/pay') }}">
@csrf
<input type="hidden" name="type" value="invoice">
<!-- @todo This is currently forcing only paypal -->
<x-leenooks::form.select id="checkout_id" name="checkout_id" icon="fa-credit-card" label="Payment Method" feedback="Payment Method is required" choose="true" :options="Checkout::active()->where('name','ilike','paypal')->orderBy('name')->get()->map(function ($item) { $item->value = $item->name; return $item; })"/>
<table id="invoices" class="table table-sm w-100">
<tr>
<th>Invoice</th>
<th class="text-right">Balance Due</th>
</tr>
@foreach (($invoices=Invoice::whereIn('id',session('invoice.cart',[]))->get()) as $io)
<input type="hidden" name="invoice_id[]" value="{{ $io->id }}">
<tr>
<td><a class="cart_delete text-dark" data-id="{{ $io->id }}" data-value="{{ $io->due }}" href="{{ url('/u/cart/delete',$io->id) }}"><i class="fas fa-trash-alt"></i></a> {{ $io->sid }}</td>
<td class="text-right">{{ number_format($io->due,2) }}</td>
</tr>
@endforeach
<tfoot>
<tr>
<th class="text-right">Sub Total</th>
<td class="text-right"><span id="subtotal">{{ number_format($invoices->sum('due'),2) }}</span></td>
</tr>
<tr>
<th class="text-right">Payment Fees</th>
<td class="text-right"><span id="payfee">TBA</span></td>
</tr>
<tr>
<th class="text-right">Payment Total</th>
<th class="text-right"><span id="paytotal">TBA</span></th>
</tr>
<tr>
<th colspan="2">
<!-- Buttons -->
<x-leenooks::button.cancel/>
<x-leenooks::button.submit class="float-right" disabled>Pay</x-leenooks::button.submit>
<a href="{{ url('/home') }}" class="mt-4 btn btn-sm btn-primary">Add Invoice</a>
</th>
</tr>
</tfoot>
</table>
</form>
</div>
</div>
</div>
</div>
<x-leenooks::errors/>
@endsection
@section('page-scripts')
<script type="text/javascript">
var subtotal = {{ $invoices->sum('due') }};
function fee_total() {
$.ajax({
type: 'POST',
data: {
total: subtotal,
checkout_id: $('#checkout_id').val()
},
dataType: 'json',
url: '{{ url('u/checkout/fee') }}',
timeout: 5000,
error: function() {
alert('Failed to submit, please try again...');
},
success: function(data) {
$('span[id=payfee]').html(data.toFixed(2));
$('span[id=paytotal]').html((subtotal+data).toFixed(2));
$('button[type=submit]').prop('disabled',false);
}
});
}
$(document).ready(function() {
if ($('#checkout_id').val())
fee_total();
$('#checkout_id').on('change',fee_total);
$('.cart_delete').click(function(item) {
var that = $(this);
// Delete
$.ajax({
url: '{{ url('u/checkout/cart/remove') }}',
method: 'POST',
data: {id: that.data('id')},
}).done(function(data) {
that.closest('tr').hide();
that.closest('tr').parent().find('input').attr('disabled',true);
subtotal -= that.data('value');
$('span[id=subtotal]').html(subtotal.toFixed(2));
if ($('#checkout_id').val())
fee_total();
}).fail(function(data) {
alert('Hmm, that didnt work?');
});
// Clear the data cache
that.removeData();
return false;
});
});
</script>
@append

52
resources/views/theme/backend/adminlte/checkout/choose.blade.php
View File

@ -1,52 +0,0 @@
@use(App\Models\Checkout)
@extends('adminlte::layouts.app')
@section('htmlheader_title')
Payment
@endsection
@section('page_title')
Payment
@endsection
@section('contentheader_title')
Payment
@endsection
@section('contentheader_description')
@endsection
@section('main-content')
<div class="row">
<div class="col-12">
<div class="card card-dark">
<div class="card-header">
<h1 class="card-title">Payment Configuration</h1>
</div>
<div class="card-body">
<div class="row">
<div class="col-12 col-lg-4">
<x-leenooks::form.select id="checkout_id" name="checkout_id" icon="fa-credit-card" label="Payment Name" feedback="Payment Name is required" addnew="New Payment" groupby="active" :options="Checkout::orderBy('active','DESC')->orderBy('name')->get()->map(function ($item) { $item->value = $item->name; return $item; })"/>
</div>
</div>
</div>
</div>
</div>
</div>
@endsection
@pa(select2,autofocus)
@section('page-scripts')
<script type="text/javascript">
$(document).ready(function() {
$('#checkout_id').select2()
.on('change',function(item) {
if (! item.target.value)
return false;
window.location.href = '{{ url('a/checkout') }}'+(item.target.value ? '/'+item.target.value : '');
});
});
</script>
@append

37
resources/views/theme/backend/adminlte/checkout/view.blade.php
View File

@ -1,37 +0,0 @@
<!-- $co=Checkout::class -->
@extends('adminlte::layouts.app')
@section('htmlheader_title')
{{ $co->name ?? 'New Checkout' }}
@endsection
@section('page_title')
{{ $co->name ?? 'New Checkout' }}
@endsection
@section('contentheader_title')
{{ $co->name ?? 'New Checkout' }}
@endsection
@section('contentheader_description')
@endsection
@section('main-content')
<div class="row">
<div class="col">
<div class="card">
<div class="card-header bg-dark p-0">
<ul class="nav nav-pills w-100 p-2">
<li class="nav-item"><a class="nav-link active" href="#details" data-toggle="tab">Detail</a></li>
</ul>
</div>
<div class="card-body">
<div class="tab-content">
<div class="tab-pane fade active show" id="details" role="tabpanel">
@include('theme.backend.adminlte.checkout.widget.detail',['o'=>$co ?? NULL])
</div>
</div>
</div>
</div>
</div>
</div>
@endsection

37
resources/views/theme/backend/adminlte/checkout/widget/detail.blade.php
View File

@ -1,37 +0,0 @@
<!-- $o=Checkout::class -->
<div class="row">
<div class="col">
<h3>Checkout Details <x-leenooks::button.success class="float-right"/></h3>
<hr>
<form method="POST" action="{{ url('a/checkout',$o?->id ?? '') }}">
@csrf
<div class="row">
<!-- Checkout Name -->
<div class="col-10 col-md-6">
<x-leenooks::form.text name="name" icon="fa-shopping-cart" label="Checkout Name" placeholder="{{ $o?->name ?: 'Payment Name' }}" feedback="Payment Name is required" :value="$o?->name"/>
</div>
<!-- Checkout Active -->
<div class="col-2">
<x-leenooks::form.toggle name="active" label="Active" :value="$o?->active"/>
</div>
</div>
<div class="row">
<!-- Description -->
<div class="col">
<x-leenooks::form.text name="description" label="Description" :value="$o?->description"/>
</div>
</div>
<div class="row">
<!-- Buttons -->
<div class="col">
<x-leenooks::button.reset/>
<x-leenooks::button.submit class="float-right">@if($o?->exists)Update @else Add @endif</x-leenooks::button.submit>
</div>
</div>
</form>
</div>
</div>

45
resources/views/theme/backend/adminlte/invoice/view.blade.php
View File

@ -18,7 +18,9 @@
@endsection
@section('main-content')
<!-- Main content -->
<div class="invoice p-3 mb-3">
<!-- title row -->
<div class="row">
<div class="col-8">
<h2>
@ -29,8 +31,10 @@
<div class="col-4 text-right">
<h1 class="text-uppercase">Tax Invoice</h1>
</div>
<!-- /.col -->
</div>
<!-- info row -->
<div class="row invoice-info">
<div class="col-4 invoice-col">
<address>
@ -80,10 +84,12 @@
</table>
</div>
</div>
<!-- /.row -->
<!-- Table row -->
<div class="row">
<div class="col">
<table class="table table-responsive table-striped table-hover">
<div class="col-12 table-responsive">
<table class="table table-striped table-hover">
<thead>
<tr>
<th>Qty</th>
@ -138,11 +144,15 @@
</tbody>
</table>
</div>
<!-- /.col -->
</div>
<!-- /.row -->
<!-- padding -->
<div class="row pb-5"></div>
<div class="row">
<!-- accepted payments column -->
<div class="col-6">
<p class="lead">Payment Methods:</p>
@ -162,6 +172,7 @@
</p>
</div>
<!-- /.col -->
<div class="ml-auto col-4">
<table class="table">
<tr>
@ -202,14 +213,18 @@
@endif
</table>
</div>
<!-- /.col -->
</div>
<!-- /.row -->
<!-- this row will not appear when printing -->
<div class="row d-print-none">
<div class="col-12">
<button type="button" id="print" class="btn btn-default"><i class="fas fa-print"></i> Print</button>
<a href="javascript:window.print();" class="btn btn-default"><i class="fas fa-print"></i> Print</a>
@if($o->id)
<a href="{{ url('u/checkout/cart',$o->id) }}" class="btn btn-success float-right"><i class="fas fa-credit-card"></i> Pay</a>
<a href="{{ url('u/invoice/cart',$o->id) }}" class="btn btn-success float-right">
<i class="fas fa-credit-card"></i> Pay
</a>
{{--
<a href="{{ url(sprintf('u/invoice/%s/pdf',$o->id)) }}" class="btn btn-primary float-right mr-2">
<i class="fas fa-download"></i> Download PDF
@ -219,23 +234,7 @@
</div>
</div>
</div>
@endsection
<!-- /.content -->
@section('page-styles')
<style media="print">
/* Dont show URL and date in print output */
@page {
size: auto; /* auto is the initial value */
margin: 0; /* this affects the margin in the printer settings */
}
</style>
@append
@section('page-scripts')
<script type="text/javascript">
$(document).ready(function() {
$('#print').on('click',function() {
window.print();
})
});
</script>
@append
<div class="clearfix"></div>
@endsection

73
resources/views/theme/backend/adminlte/payment/home.blade.php Normal file
View File

@ -0,0 +1,73 @@
@extends('adminlte::layouts.app')
@section('htmlheader_title')
Payment
@endsection
@section('page_title')
Payment
@endsection
@section('contentheader_title')
Payment
@endsection
@section('contentheader_description')
@endsection
@section('main-content')
<div class="row">
<div class="col-12">
<div class="card card-dark">
<div class="card-header">
<h1 class="card-title">Payment Configuration</h1>
</div>
<div class="card-body">
<form class="g-0 needs-validation" method="POST" enctype="multipart/form-data" role="form">
@csrf
<div class="row">
<div class="col-4">
<div class="form-group has-validation">
<label for="name">Payment Name</label>
<select class="form-control form-control-border" id="name" name="checkout_id">
<option value=""></option>
<option value="">Add New</option>
@foreach(\App\Models\Checkout::orderBy('active','DESC')->orderBy('name')->get()->groupBy('active') as $o)
<optgroup label="{{ $o->first()->active ? 'Active' : 'Not Active' }}">
@foreach($o as $oo)
<option value="{{ $oo->id }}">{{ $oo->name }}</option>
@endforeach
</optgroup>
@endforeach
</select>
<span class="invalid-feedback" role="alert">
@error('name')
{{ $message }}
@else
Payment Name is required.
@enderror
</span>
<span class="input-helper">Payment Name</span>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
@endsection
@section('page-scripts')
@css(select2)
@js(select2,autofocus)
<script type="text/javascript">
$(document).ready(function() {
$('#name').select2()
.on('change',function(item) {
window.location.href = '{{ url('a/checkout') }}'+(item.target.value ? '/'+item.target.value : '');
});
});
</script>
@endsection

161
resources/views/theme/backend/adminlte/payment/view.blade.php
View File

@ -1,167 +1,38 @@
<!-- po=Payment::class -->
@use(Carbon\Carbon)
@use(App\Models\Account)
@use(App\Models\Checkout)
<!-- $o = Checkout::class -->
@extends('adminlte::layouts.app')
@section('htmlheader_title')
Payment
{{ $o->name ?: 'New Payment' }}
@endsection
@section('page_title')
Payment
{{ $o->name ?: 'New Payment' }}
@endsection
@section('contentheader_title')
Record Payment
{{ $o->name ?: 'New Payment' }}
@endsection
@section('contentheader_description')
@include('adminlte::widget.status')
@endsection
@section('main-content')
<div class="card card-dark">
<div class="card-body">
<form method="POST" action="{{ url('r/payment',$po?->id ?? '') }}">
@csrf
<x-leenooks::button.success class="float-right" row="true"/>
<div class="row">
<div class="col-12 col-sm-6 col-lg-3">
<div class="row">
<div class="col-12 col-md-9 col-lg-12">
<!-- Account -->
<!-- @todo Only show active accounts or accounts with outstanding invoices -->
<x-leenooks::form.select name="account_id" icon="fa-user" label="Account" feedback="Sweep Type is required" helper="Account to add payment to." :options="Account::active()->with(['user'])->get()->sortBy('name')->map(fn($item,$key)=>['id'=>$item->id,'value'=>$item->name])" :value="$po?->account_id ?? ''"/>
</div>
</div>
<div class="row">
<div class="col-12 col-md-9 col-lg-12">
<!-- Received -->
<x-leenooks::form.date name="paid_at" icon="fa-calendar" label="Date Received" feedback="Payment Date is required" helper="Date payment received" :value="($po?->paid_at ?? Carbon::now())->format('Y-m-d')"/>
</div>
</div>
<!-- METHOD -->
<div class="row">
<div class="col-12 col-md-9 col-lg-12">
<x-leenooks::form.select name="checkout_id" icon="fa-dollar-sign" label="Payment Method" :options="Checkout::orderBy('name')->get()->map(fn($item,$key)=>['id'=>$item->id,'value'=>$item->name])" :value="$po?->checkout_id ?? ''"/>
</div>
</div>
</div>
<div class="col-12 col-sm-6 col-log-3">
<div class="row">
<div class="col-12 col-md-6">
<!-- Amount -->
<x-leenooks::form.text class="text-right" id="total_amt" name="total_amt" icon="fa-dollar-sign" label="Amount" helper="Amount received" :value="$po?->total_amt ?? 0"/>
</div>
</div>
<div class="row">
<div class="col-12 col-md-6">
<!-- Payment Fee -->
<x-leenooks::form.text class="text-right" id="fees_amt" name="fees_amt" icon="fa-dollar-sign" label="Fee" helper="Payment fees" :value="$po?->fees_amt ?? ''"/>
</div>
</div>
<div class="row">
<div class="col-12 col-md-6">
<!-- Balance -->
<x-leenooks::form.text class="text-right" id="balance" name="balance" icon="fa-dollar-sign" label="Balance" helper="Payment unallocated" :value="$po?->total ?? 0" disabled/>
</div>
</div>
</div>
</div>
<div class="row mt-3 mb-3">
<div class="col-12">
<div id="invoices"></div>
@error('invoices')
<span class="invalid-feedback d-block mt-2 mb-2">
{{ $message }}
</span>
@enderror
</div>
<div class="card">
<div class="card-header bg-dark d-flex p-0">
<ul class="nav nav-pills w-100 p-2">
<li class="nav-item"><a class="nav-link active" href="#details" data-toggle="tab">Detail</a></li>
</ul>
</div>
<div class="row">
<!-- Buttons -->
<div class="col">
<x-leenooks::button.cancel/>
<x-leenooks::button.submit class="float-right">@if($po?->exists ?? FALSE)Update @else Add @endif</x-leenooks::button.submit>
<div class="card-body">
<div class="tab-content">
<div class="tab-pane fade active show" id="details" role="tabpanel">
@include('theme.backend.adminlte.payment.widget.detail')
</div>
</div>
</div>
</div>
</form>
</div>
</div>
<x-leenooks::errors/>
@endsection
@section('page-scripts')
<script type="text/javascript">
function populate(account,spinner) {
spinner.toggleClass('d-none').toggleClass('fa-spin');
$.ajax({
type: 'POST',
dataType: 'html',
cache: false,
url: '{{ url('r/account/invoices') }}',
data: {
aid: account,
pid: {{ $po?->id ?? 'null' }},
errors: {!! $errors !!},
old: {!! json_encode(old()) !!}
},
timeout: 2000,
error: function(x) {
spinner.toggleClass('d-none').toggleClass('fa-spin');
alert('Failed to submit');
},
success: function(data) {
spinner.toggleClass('d-none').toggleClass('fa-spin');
$("div[id=invoices]").empty().append(data);
}
});
}
function balance() {
var alloc = 0;
$('input[id^=invoices_]').each(function() {
alloc += parseFloat($(this).val());
})
$('#balance').val(($('#total_amt').val()-alloc).toFixed(2))
}
$(document).ready(function() {
if ($('#account_id').val()) {
var spinner = $('#account_id').parent().parent().find('i.fas.fa-spinner');
populate($('#account_id').val(),spinner);
}
$('#account_id').select2({
sorter: data => data.sort((a, b) => a.text.localeCompare(b.text)),
})
.on('change',function(e) {
if (! $(this).val()) {
$("div[id=invoices]").empty();
return;
}
var spinner = $(this).parent().parent().find('i.fas.fa-spinner');
populate($(this).val(),spinner);
});
$('#total_amt').on('change',balance);
});
$(document).on('change','input[id^=invoices_]',balance);
</script>
@append

70
resources/views/theme/backend/adminlte/payment/widget/detail.blade.php Normal file
View File

@ -0,0 +1,70 @@
<!-- $o = Checkout::class -->
<div class="row">
<div class="col-12">
<h3>Checkout Details</h3>
<hr>
@if(session()->has('success'))
<span class="ml-3 pt-0 pb-0 pr-1 pl-1 btn btn-outline-success"><small>{{ session()->get('success') }}</small></span>
@endif
<form class="g-0 needs-validation" method="POST" enctype="multipart/form-data" role="form">
@csrf
<div class="row">
<div class="col-6">
<div class="row">
<!-- Checkout Name -->
<div class="col-9">
<div class="form-group has-validation">
<label for="name">Checkout Name</label>
<input type="text" class="form-control form-control-border @error('name') is-invalid @enderror" id="name" name="name" placeholder="Supplier Name" value="{{ old('name',$o->name) }}" required>
<span class="invalid-feedback" role="alert">
@error('name')
{{ $message }}
@else
Payment Name required.
@enderror
</span>
</div>
</div>
<!-- Checkout Active -->
<div class="col-3">
<div class="form-group">
<div class="custom-control custom-switch custom-switch-off-danger custom-switch-on-success">
<input type="checkbox" class="custom-control-input" id="active" name="active" {{ old('active',$o->active) ? 'checked' : '' }}>
<label class="custom-control-label" for="active">Active</label>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="row">
<!-- Description -->
<div class="col-12">
<div class="form-group has-validation">
<label for="description">Description</label>
<input type="text" class="form-control form-control-border @error('description') is-invalid @enderror" id="address1" name="description" placeholder="description" value="{{ old('description',$o->description) }}">
<span class="invalid-feedback" role="alert">
@error('description')
{{ $message }}
@enderror
</span>
</div>
</div>
</div>
<div class="row">
<!-- Buttons -->
<div class="col-12">
<a href="{{ url('/home') }}" class="btn btn-danger">Cancel</a>
@can('wholesaler')
<button type="submit" name="submit" class="btn btn-success mr-0 float-right">@if ($o->exists)Save @else Add @endif</button>
@endcan
</div>
</div>
</form>
</div>
</div>

109
resources/views/theme/backend/adminlte/u/invoice/cart.blade.php Normal file
View File

@ -0,0 +1,109 @@
@extends('adminlte::layouts.app')
@section('htmlheader_title')
Payment Cart
@endsection
@section('page_title')
Payments
@endsection
@section('contentheader_title')
Payment Cart
@endsection
@section('contentheader_description')
@endsection
@section('main-content')
<div class="row">
<div class="col-4">
<div class="card card-dark">
<div class="card-header">
<span class="card-title">Invoices to Pay</span>
</div>
<div class="card-body">
<form method="POST" action="{{ url('u/checkout/pay') }}">
@csrf
<input type="hidden" name="type" value="invoice">
<div class="input-group mb-5">
<div class="input-group-prepend">
<span class="input-group-text">Payment Method</span>
</div>
<select class="form-control" id="paymethod" name="checkout_id[]" required>
<option></option>
@foreach (\App\Models\Checkout::active()->orderBy('name')->get() as $oo)
<option value="{{ $oo->id }}">{{ $oo->name }}</option>
@endforeach
</select>
</div>
<table id="invoices" class="table table-sm w-100">
<tr>
<th>Invoice</th>
<th class="text-right">Balance Due</th>
</tr>
@foreach ($invoices as $io)
<input type="hidden" name="invoice_id[]" value="{{ $io->id }}">
<tr>
<td>{{ $io->sid }}</td>
<td class="text-right">{{ number_format($io->due,2) }}</td>
</tr>
@endforeach
<tfoot>
<tr>
<th class="text-right">Sub Total</th>
<td class="text-right">{{ number_format($invoices->sum('due'),2) }}</td>
</tr>
<tr>
<th class="text-right">Payment Fees</th>
<td class="text-right"><span id="payfee">TBA</span></td>
</tr>
<tr>
<th class="text-right">Payment Total</th>
<th class="text-right"><span id="paytotal">TBA</span></th>
</tr>
<tr>
<th colspan="2">
<input type="submit" class="btn btn-dark mt-2" name="pay" value="Cancel">
<input type="submit" class="btn btn-success mt-2 float-right" name="pay" value="Submit" disabled>
<a href="{{ url('/home') }}" class="btn btn-danger mt-2 float-right mr-2">Add Invoice</a>
</th>
</tr>
</tfoot>
</table>
</form>
</div>
</div>
</div>
</div>
@endsection
@section('page-scripts')
<script>
$(document).ready(function() {
$('#paymethod').on('change',function(item) {
$.ajax({
type: "POST",
data: {total: {{ $invoices->sum('due') }},count: {{ $invoices->count() }} },
dataType: "json",
cache: true,
url: '{{ url('api/u/checkout/fee') }}'+'/'+$(this).val(),
timeout: 25000,
error: function(x) {
alert("Failed to submit, please try again...");
},
success: function(data) {
$("span[id=payfee]").html(data.toFixed(2));
$("span[id=paytotal]").html(({{ $invoices->sum('due') }}+data).toFixed(2));
$("input[type=submit]").prop('disabled',false);
}
});
});
});
</script>
@append

10
resources/views/vendor/adminlte/layouts/partials/sidebarmenu.blade.php vendored
View File

@ -24,21 +24,21 @@
@can('wholesaler')
<!-- PAYMENTS -->
<li @class(['nav-item','has-treeview','menu-open'=>$x=preg_match('#^r/payment/#',$path),'menu-closed'=>! $x])>
<a href="#" @class(['nav-link','active'=>preg_match('#^r/payment/#',$path)])>
<li @class(['nav-item','has-treeview','menu-open'=>$x=preg_match('#^a/payment/#',$path),'menu-closed'=>! $x])>
<a href="#" @class(['nav-link','active'=>preg_match('#^a/payment/#',$path)])>
<i class="nav-icon fas fa-receipt"></i>
<p>Payments <i class="fas fa-angle-left right"></i></p>
</a>
<ul class="nav nav-treeview">
<li class="nav-item">
<a href="{{ url('r/payment/new') }}" @class(['nav-link','active'=>$path === 'r/payment/new'])>
<a href="{{ url('a/payment/addedit') }}" @class(['nav-link','active'=>$path === 'a/payment/addedit'])>
<i class="fas fa-money-bill nav-icon"></i> <p>New Payment</p>
</a>
</li>
<li class="nav-item">
<a href="{{ url('r/payment/unapplied') }}" @class(['nav-link','active'=>$path === 'r/payment/unapplied'])>
<a href="{{ url('a/payment/unapplied') }}" @class(['nav-link','active'=>$path === 'a/payment/unapplied'])>
<i class="fas fa-receipt nav-icon"></i> <p>Unapplied</p>
</a>
</li>
@ -64,7 +64,7 @@
<!-- CHECKOUT (PAYMENTS) -->
<li class="nav-item">
<a href="{{ url('a/checkout') }}" @class(['nav-link','active'=>preg_match('#^a/checkout#',$path)])>
<i class="nav-icon fas fa-money-check-alt"></i> <p>Checkout</p>
<i class="nav-icon fas fa-money-check-alt"></i> <p>Payments</p>
</a>
</li>

10
routes/api.php
View File

@ -24,7 +24,17 @@ Route::group(['middleware'=>['auth:api','role:wholesaler']], function() {
Route::get('a/supplier_products',[ProductController::class,'api_supplier_products']);
});
// Reseller API calls
Route::group(['middleware'=>['auth:api','role:reseller']], function() {
Route::post('r/invoices/{o}',[AdminController::class,'pay_invoices'])
->where('o','[0-9]+')
->middleware(['theme:adminlte-be','role:wholesaler']);
});
Route::group(['middleware'=>'auth:api'], function() {
Route::post('/u/checkout/fee/{o}',[CheckoutController::class,'fee'])
->where('o','[0-9]+');
Route::any('/intuit/accounting/list',[AccountingController::class,'list']);
});

39
routes/web.php
View File

@ -12,7 +12,6 @@ use App\Http\Controllers\{AdminController,
HomeController,
InvoiceController,
OrderController,
PaymentController,
PaypalController,
ProductController,
SearchController,
@ -78,15 +77,13 @@ Route::group(['middleware'=>['auth','role:wholesaler'],'prefix'=>'a'],function()
->where('so','[0-9]+');
// Site Setup
Route::view('setup','theme.backend.adminlte.setup');
Route::view('setup','theme.backend.adminlte.a.setup');
Route::post('setup',[AdminController::class,'setup']);
// Checkout Setup (Payments)
Route::model('co',\App\Models\Checkout::class);
Route::view('checkout','theme.backend.adminlte.checkout.choose');
Route::view('checkout/new','theme.backend.adminlte.checkout.view');
Route::view('checkout/{co}','theme.backend.adminlte.checkout.view')
->where('co','[0-9]+');
Route::get('checkout',[CheckoutController::class,'home']);
Route::get('checkout/{o?}',[CheckoutController::class,'view'])
->where('o','[0-9]+');
Route::post('checkout/{o?}',[CheckoutController::class,'addedit'])
->where('o','[0-9]+');
@ -124,6 +121,10 @@ Route::group(['middleware'=>['auth','role:wholesaler'],'prefix'=>'a'],function()
Route::get('report/products',[ReportController::class,'products']);
Route::view('report/services','theme.backend.adminlte.service.report');
// Payments - @todo This should probably go to resellers
Route::match(['get','post'],'payment/addedit/{o?}',[AdminController::class,'pay_addedit']);
Route::get('payment/unapplied',[AdminController::class,'pay_unapplied']);
// Services
// @todo This should probably go to resellers - implement a change audit log first
Route::post('service/update/{o}',[ServiceController::class,'update'])
@ -149,23 +150,12 @@ Route::group(['middleware'=>['auth','role:reseller'],'prefix'=>'r'],function() {
Route::get('hosting',[ServiceController::class,'hosting_list']);
});
Route::post('account/invoices',[InvoiceController::class,'api_account_invoices']);
// Charges
Route::post('charge/addedit',[ChargeController::class,'addedit']);
Route::post('charge/delete/{o}',[ChargeController::class,'delete'])
->where('o','[0-9]+');
Route::post('charge/edit',[ChargeController::class,'edit']);
// Payments
Route::model('po',\App\Models\Payment::class);
Route::view('payment/new','theme.backend.adminlte.payment.view');
Route::view('payment/{po}','theme.backend.adminlte.payment.view')
->where('po','[0-9]+');
Route::post('payment/{o?}',[PaymentController::class,'addedit'])
->where('o','[0-9]+');
Route::view('payment/unapplied','theme.backend.adminlte.payment.unapplied');
// Reseller API calls
Route::post('service_change_charges/{o}',[ServiceController::class,'service_change_charges_display'])
->where('o','[0-9]+');
@ -180,22 +170,17 @@ Route::group(['middleware'=>['auth'],'prefix'=>'u'],function() {
Route::get('home/{o}',[HomeController::class,'home'])
->where('o','[0-9]+')
->middleware('can:view,o');
Route::view('checkout/cart','theme.backend.adminlte.checkout.cart');
Route::get('checkout/cart/{o}',[CheckoutController::class,'cart_invoice'])
->where('o','[0-9]+')
->middleware('can:view,o');
Route::post('checkout/cart/remove',[CheckoutController::class,'cart_remove']);
Route::post('checkout/fee',[CheckoutController::class,'fee']);
Route::post('checkout/pay',[CheckoutController::class,'pay']);
Route::get('invoice/{o}',[InvoiceController::class,'view'])
->where('o','[0-9]+')
->middleware('can:view,o');
Route::get('invoice/{o}/pdf',[InvoiceController::class,'pdf'])
->where('o','[0-9]+')
->middleware('can:view,o');
Route::get('invoice/cart',[CheckoutController::class,'cart_invoice']);
Route::get('invoice/cart/{o}',[CheckoutController::class,'cart_invoice'])
->where('o','[0-9]+')
->middleware('can:view,o');
Route::get('service/{o}',[ServiceController::class,'home'])
->where('o','[0-9]+')
->middleware('can:view,o');