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

Some invoice layout fixes, start on traffic collection, update console command service:list

Browse Source
This commit is contained in:
Deon George
2020-05-27 16:09:03 +10:00
parent dd1460463f
commit 86861a6daf
5 changed files with 211 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
app/Console/Commands/BroadbandTraffic.php Normal file
View File

@@ -0,0 +1,47 @@
<?php
namespace App\Console\Commands;
use Illuminate\Console\Command;
use App\Jobs\BroadbandTraffic as Job;
use App\Models\AdslSupplier;
class BroadbandTraffic extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'broadband:traffic:import';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Input Broadband Traffic from Suppliers';
/**
* Create a new command instance.
*
* @return void
*/
public function __construct()
{
parent::__construct();
}
/**
* Execute the console command.
*
* @return mixed
*/
public function handle()
{
foreach (AdslSupplier::active()->get() as $o) {
Job::dispatchNow($o);
}
}
}

42
app/Console/Commands/ServiceList.php
View File

@@ -15,7 +15,10 @@ class ServiceList extends Command
*
* @var string
*/
protected $signature = 'service:list';
protected $signature = 'service:list '.
'{--a|active : Active Only}'.
'{--category= : Category}'.
'{--f|fix : Fix start_date}';
/**
* The console command description.
@@ -45,15 +48,46 @@ class ServiceList extends Command
Log::debug('- SQL',['sql'=>$query->sql,'binding'=>$query->bindings]);
});
foreach (Service::active()->get() as $o) {
$this->info(sprintf('|%10s|%-6s|%-20s|%-50s|%8s|%14s|%10s|',
$this->warn(sprintf('|%10s|%-6s|%-20s|%-50s|%8s|%14s|%10s|%10s|%10s|%10s|%10s|',
'ID',
'CAT',
'Product',
'Name',
'active',
'status',
'invoice next',
'start date',
'stop date',
'connect date',
'first invoice'
));
foreach (Service::all() as $o) {
if ($this->option('active') AND ! $o->isActive())
continue;
if ($this->option('category') AND $o->product->category !== $this->option('category'))
continue;
$c = $o->invoice_items->filter(function($item) {return $item->item_type === 0; })->sortby('date_start')->first();
if ($this->option('fix') AND ! $o->date_start AND $c AND $c->date_start AND $o->type AND $o->type->service_connect_date AND $c->date_start->format('Y-m-d') == $o->type->service_connect_date->format('Y-m-d')) {
$o->date_start = $o->type->service_connect_date;
$o->save();
}
$this->info(sprintf('|%10s|%-6s|%-20s|%-50s|%8s|%14s|%10s|%10s|%10s|%10s|%10s|',
$o->sid,
$o->product->category,
$o->product_name,
$o->name_short,
$o->active ? 'active' : 'inactive',
$o->status,
$o->invoice_next ? $o->invoice_next : NULL,
$o->invoice_next ? $o->invoice_next->format('Y-m-d') : NULL,
$o->date_start ? $o->date_start->format('Y-m-d') : NULL,
$o->date_end ? $o->date_end->format('Y-m-d') : NULL,
($o->type AND $o->type->service_connect_date) ? $o->type->service_connect_date->format('Y-m-d') : NULL,
$c ? $c->date_start->format('Y-m-d') : NULL,
));
}
}