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

Start work on updating services

Browse Source
This commit is contained in:
Deon George
2022-04-19 17:07:39 +10:00
parent ebf08ea414
commit 621a132e35
63 changed files with 1038 additions and 612 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,7 +28,7 @@ class AdminController extends Controller
$request->validate([
'account_id' => 'required|exists:accounts,id',
'charge_date' => 'required|date',
'service_id' => 'required|exists:ab_service,id',
'service_id' => 'required|exists:services,id',
'quantity' => 'required|numeric|not_in:0',
'amount' => 'required|numeric|min:0.01',
'sweep_type' => 'required|numeric|in:'.implode(',',array_keys(Charge::sweep)),

6
app/Http/Controllers/ProductController.php
View File

@@ -20,7 +20,7 @@ class ProductController extends Controller
{
switch ($request->type) {
case 'App\Models\Product\Broadband':
return Product\Broadband::select(['id','supplier_broadband_id'])
return Product\Broadband::select(['id','supplier_item_id'])
->with(['supplied.supplier_detail.supplier'])
->get()
->map(function($item) { return ['id'=>$item->id,'name'=>sprintf('%s: %s',$item->supplied->supplier_detail->supplier->name,$item->supplied->name)]; })
@@ -28,7 +28,7 @@ class ProductController extends Controller
->values();
case 'App\Models\Product\Email':
return Product\Email::select(['id','supplier_email_id'])
return Product\Email::select(['id','supplier_item_id'])
->with(['supplied.supplier_detail.supplier'])
->get()
->map(function($item) { return ['id'=>$item->id,'name'=>sprintf('%s: %s',$item->supplied->supplier_detail->supplier->name,$item->supplied->name)]; })
@@ -36,7 +36,7 @@ class ProductController extends Controller
->values();
case 'App\Models\Product\Host':
return Product\Host::select(['id','supplier_host_id'])
return Product\Host::select(['id','supplier_item_id'])
->with(['supplied.supplier_detail.supplier'])
->get()
->map(function($item) { return ['id'=>$item->id,'name'=>sprintf('%s: %s',$item->supplied->supplier_detail->supplier->name,$item->supplied->name)]; })

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

@@ -7,7 +7,7 @@ use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Gate;
use App\Models\{Account,Invoice,Payment,Service,Service\Adsl,Service\Voip,User};
use App\Models\{Account,Invoice,Payment,Service,Service\Broadband,Service\Phone,User};
class SearchController extends Controller
{
@@ -65,8 +65,8 @@ class SearchController extends Controller
$result->push(['name'=>sprintf('%s: %s',$o->sid,$o->account->name),'value'=>'/u/invoice/'.$o->id,'category'=>'Invoices']);
}
# Look for an ADSL/NBN Service
foreach (Service\Broadband::Search($request->input('term'))
# Look for an Broadband Service
foreach (Broadband::Search($request->input('term'))
->whereIN('account_id',$accounts)
->orderBy('service_number')
->limit(10)->get() as $o)
@@ -74,13 +74,13 @@ class SearchController extends Controller
$result->push(['name'=>sprintf('%s (%s)',$o->service_name,$o->service->sid),'value'=>'/u/service/'.$o->id,'category'=>'Broadband']);
}
# Look for an VOIP Service
foreach (Voip::Search($request->input('term'))
# Look for an Phone Service
foreach (Phone::Search($request->input('term'))
->whereIN('account_id',$accounts)
->orderBy('service_number')
->limit(10)->get() as $o)
{
$result->push(['name'=>sprintf('%s (%s)',$o->service_name,$o->service->sid),'value'=>'/u/service/'.$o->id,'category'=>'VOIP']);
$result->push(['name'=>sprintf('%s (%s)',$o->service_name,$o->service->sid),'value'=>'/u/service/'.$o->id,'category'=>'Phone']);
}
# Look for Domain Name

12
app/Http/Controllers/ServiceController.php
View File

@@ -246,8 +246,8 @@ class ServiceController extends Controller
{
$o = Service\Domain::serviceActive()
->serviceUserAuthorised(Auth::user())
->select('service_domains.*')
->join('ab_service',['ab_service.id'=>'service_domains.service_id'])
->select('service_domain.*')
->join('services',['services.id'=>'service_domain.service_id'])
->with(['service.account','registrar'])
->get();
@@ -260,8 +260,8 @@ class ServiceController extends Controller
// @todo Need to add the with path when calculating next_billed and price
$o = Service\Email::serviceActive()
->serviceUserAuthorised(Auth::user())
->select('service_emails.*')
->join('ab_service',['ab_service.id'=>'service_emails.service_id'])
->select('service_email.*')
->join('services',['services.id'=>'service_email.service_id'])
->with(['service.account','service.product.type.supplied.supplier_detail.supplier','tld'])
->get();
@@ -274,8 +274,8 @@ class ServiceController extends Controller
// @todo Need to add the with path when calculating next_billed and price
$o = Service\Host::serviceActive()
->serviceUserAuthorised(Auth::user())
->select('ab_service__hosting.*')
->join('ab_service',['ab_service.id'=>'ab_service__hosting.service_id'])
->select('service_host.*')
->join('services',['services.id'=>'service_host.service_id'])
->with(['service.account','service.product.type.supplied.supplier_detail.supplier','tld'])
->get();