Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 06:34:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for report previews

Browse Source
This commit is contained in:
David Bomba 2023-09-25 06:52:14 +10:00
parent 52ad04dcc1
commit 3d30954690
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Export/CSV/ClientExport.php
View File

@ -185,7 +185,7 @@ class ClientExport extends BaseExport
$clean_row[$key]['id'] = $report_keys[1] ?? $report_keys[0]; $clean_row[$key]['id'] = $report_keys[1] ?? $report_keys[0];
$clean_row[$key]['hashed_id'] = $report_keys[0] == 'client' ? null : $resource->{$report_keys[0]}->hashed_id ?? null; $clean_row[$key]['hashed_id'] = $report_keys[0] == 'client' ? null : $resource->{$report_keys[0]}->hashed_id ?? null;
$clean_row[$key]['value'] = $row[$column_key]; $clean_row[$key]['value'] = $row[$column_key];
$clean_row[$key]['identifier'] = $value; $clean_row[$key]['identifier'] = $key;
if(in_array($clean_row[$key]['id'], ['paid_to_date', 'balance', 'credit_balance','payment_balance'])) if(in_array($clean_row[$key]['id'], ['paid_to_date', 'balance', 'credit_balance','payment_balance']))
$clean_row[$key]['display_value'] = Number::formatMoney($row[$column_key], $resource); $clean_row[$key]['display_value'] = Number::formatMoney($row[$column_key], $resource);

18
app/Services/PurchaseOrder/PurchaseOrderInventory.php
View File

@ -16,11 +16,9 @@ use App\Models\PurchaseOrder;
class PurchaseOrderInventory class PurchaseOrderInventory
{ {
private PurchaseOrder $purchase_order;
public function __construct(PurchaseOrder $purchase_order) public function __construct(private PurchaseOrder $purchase_order)
{ {
$this->purchase_order = $purchase_order;
} }
public function run() public function run()
@ -31,7 +29,19 @@ class PurchaseOrderInventory
$p = Product::query()->where('product_key', $item->product_key)->where('company_id', $this->purchase_order->company_id)->first(); $p = Product::query()->where('product_key', $item->product_key)->where('company_id', $this->purchase_order->company_id)->first();
if (!$p) { if (!$p) {
continue; $p = new Product();
$p->user_id = $this->purchase_order->user_id;
$p->company_id = $this->purchase_order->company_id;
$p->project_id = $this->purchase_order->project_id;
$p->vendor_id = $this->purchase_order->vendor_id;
$p->product_key = $item->product_key;
$p->notes = $item->notes ?? '';
$p->price = $item->cost ?? 0;
$p->quantity = $item->quantity ?? 0;
$p->custom_value1 = $item->custom_value1 ?? '';
$p->custom_value2 = $item->custom_value2 ?? '';
$p->custom_value3 = $item->custom_value3 ?? '';
$p->custom_value4 = $item->custom_value4 ?? '';
} }
$p->in_stock_quantity += $item->quantity; $p->in_stock_quantity += $item->quantity;

1
phpstan.neon
View File

@ -22,6 +22,7 @@ parameters:
- App\DataMapper\Tax\RuleInterface - App\DataMapper\Tax\RuleInterface
- App\DataMapper\FeesAndLimits - App\DataMapper\FeesAndLimits
- \Postmark\Models\DynamicResponseModel - \Postmark\Models\DynamicResponseModel
- \Stripe\Collection
reportUnmatchedIgnoredErrors: false reportUnmatchedIgnoredErrors: false
ignoreErrors: ignoreErrors:
- '#Array has 2 duplicate keys with value#' - '#Array has 2 duplicate keys with value#'