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

Fix adding the product_id to account based charges (when services are not active)
All checks were successful
Create Docker Image / Build Docker Image (x86_64) (push) Successful in 38s
Details
Create Docker Image / Final Docker Image Manifest (push) Successful in 10s
Details

Browse Source
This commit is contained in:
Deon George 2024-09-16 11:36:55 +10:00
parent 7ec28218fa
commit a65c81871b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Console/Commands/Intuit/InvoiceAdd.php
View File

@ -70,13 +70,13 @@ class InvoiceAdd extends Command
sprintf('%s.%s.%s.%s', sprintf('%s.%s.%s.%s',
$item->item_type_name, $item->item_type_name,
$item->price_base, $item->price_base,
$item->product->provider_ref($to->provider), $item->product?->provider_ref($to->provider),
$item->taxes->pluck('description')->join('|'))) as $os) $item->taxes->pluck('description')->join('|'))) as $os)
{ {
$key = $os->first(); $key = $os->first();
// Some validation // Some validation
if (! ($ref=$key->product->provider_ref($to->provider))) { if (! ($ref=$key->product?->provider_ref($to->provider))) {
$this->error(sprintf('Accounting not defined in product [%d]',$key->product_id)); $this->error(sprintf('Accounting not defined in product [%d]',$key->product_id));
return self::FAILURE; return self::FAILURE;

2
app/Models/Account.php
View File

@ -285,7 +285,7 @@ class Account extends Model implements IDs
$ii->active = TRUE; $ii->active = TRUE;
$ii->service_id = $oo->service_id; $ii->service_id = $oo->service_id;
$ii->product_id = $this->product_id; $ii->product_id = $oo->product_id;
$ii->quantity = $oo->quantity; $ii->quantity = $oo->quantity;
$ii->item_type = $oo->type; $ii->item_type = $oo->type;
$ii->price_base = $oo->amount; $ii->price_base = $oo->amount;

2
public/css/fixes.css vendored
View File

@ -84,7 +84,7 @@ span.select2-selection.select2-selection--single > span.select2-selection__rende
width: 100%; 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--single,
.is-invalid + .select2-container--default .select2-selection--multiple { .is-invalid + .select2-container--default .select2-selection--multiple {
border: 1px solid #dc3545; border: 1px solid #dc3545;