diff --git a/app/Export/CSV/ClientExport.php b/app/Export/CSV/ClientExport.php index 79a59ddbd71a..ce070b5db6dd 100644 --- a/app/Export/CSV/ClientExport.php +++ b/app/Export/CSV/ClientExport.php @@ -185,7 +185,7 @@ class ClientExport extends BaseExport $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]['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'])) $clean_row[$key]['display_value'] = Number::formatMoney($row[$column_key], $resource); diff --git a/app/Services/PurchaseOrder/PurchaseOrderInventory.php b/app/Services/PurchaseOrder/PurchaseOrderInventory.php index e3e6036bf5a2..7954e0ae5a01 100644 --- a/app/Services/PurchaseOrder/PurchaseOrderInventory.php +++ b/app/Services/PurchaseOrder/PurchaseOrderInventory.php @@ -16,11 +16,9 @@ use App\Models\PurchaseOrder; 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() @@ -31,7 +29,19 @@ class PurchaseOrderInventory $p = Product::query()->where('product_key', $item->product_key)->where('company_id', $this->purchase_order->company_id)->first(); 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; diff --git a/phpstan.neon b/phpstan.neon index 12c2ae3a3c52..4ab5daf41736 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -22,6 +22,7 @@ parameters: - App\DataMapper\Tax\RuleInterface - App\DataMapper\FeesAndLimits - \Postmark\Models\DynamicResponseModel + - \Stripe\Collection reportUnmatchedIgnoredErrors: false ignoreErrors: - '#Array has 2 duplicate keys with value#'