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

Added list option to invoice:generate. Fix account PushNew()

Browse Source
This commit is contained in:
Deon George 2020-05-29 14:40:49 +10:00
parent 121aa5b31c
commit 251298a230
No known key found for this signature in database
GPG Key ID: 7670E8DC27415254
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/Console/Commands/InvoiceGenerate.php
View File

@ -14,7 +14,7 @@ class InvoiceGenerate extends Command
* *
* @var string * @var string
*/ */
protected $signature = 'invoice:generate {account?} {--p|preview : Preview}'; protected $signature = 'invoice:generate {account?} {--p|preview : Preview} {--l|list : List Items}';
/** /**
* The console command description. * The console command description.
@ -60,6 +60,24 @@ class InvoiceGenerate extends Command
$io->account_id = $o->id; $io->account_id = $o->id;
if ($this->option('list')) {
$this->warn(sprintf('|%4s|%4s|%-50s|%8s|',
'SID',
'PID',
'Name',
'Amount',
));
foreach ($io->items as $oo) {
$this->info(sprintf('|%4s|%4s|%-50s|%8.2f|',
$oo->service_id,
$oo->product_id,
$oo->item_type_name,
$oo->total,
));
}
}
if ($this->option('preview')) { if ($this->option('preview')) {
$this->info(sprintf('Invoice for Account [%d] - [%d] items totalling [%3.2f]',$o->id,$io->items->count(),$io->total)); $this->info(sprintf('Invoice for Account [%d] - [%d] items totalling [%3.2f]',$o->id,$io->items->count(),$io->total));
continue; continue;

5
app/Models/Account.php
View File

@ -6,10 +6,11 @@ use Illuminate\Database\Eloquent\Collection;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use App\Traits\NextKey; use App\Traits\NextKey;
use App\Traits\PushNew;
class Account extends Model class Account extends Model
{ {
use NextKey; use NextKey,PushNew;
const RECORD_ID = 'account'; const RECORD_ID = 'account';
public $incrementing = FALSE; public $incrementing = FALSE;
@ -92,7 +93,7 @@ class Account extends Model
// Build our where clause // Build our where clause
// First Name, Last name // First Name, Last name
if (preg_match('/\ /',$term)) { if (preg_match('/\ /',$term)) {
list($fn,$ln) = explode(' ',$term,2); [$fn,$ln] = explode(' ',$term,2);
$query->where(function($query1) use ($fn,$ln,$term) { $query->where(function($query1) use ($fn,$ln,$term) {
$query1->where(function($query2) use ($fn,$ln) { $query1->where(function($query2) use ($fn,$ln) {