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

Minor fixes for payment imports

Browse Source
This commit is contained in:
David Bomba 2023-05-10 08:58:04 +10:00
parent 879d3181cb
commit 5a0514a905
3 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/PurchaseOrderController.php
View File

@ -360,6 +360,7 @@ class PurchaseOrderController extends BaseController
$purchase_order = $purchase_order->service() $purchase_order = $purchase_order->service()
->triggeredActions($request) ->triggeredActions($request)
->touchPdf()
->save(); ->save();
event(new PurchaseOrderWasUpdated($purchase_order, $purchase_order->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null))); event(new PurchaseOrderWasUpdated($purchase_order, $purchase_order->company, Ninja::eventVars(auth()->user() ? auth()->user()->id : null)));

3
app/Import/Providers/BaseImport.php
View File

@ -470,6 +470,9 @@ class BaseImport
if (! empty($invoice_data['status_id'])) { if (! empty($invoice_data['status_id'])) {
$invoice->status_id = $invoice_data['status_id']; $invoice->status_id = $invoice_data['status_id'];
} }
nlog($invoice_data);
$invoice_repository->save($invoice_data, $invoice); $invoice_repository->save($invoice_data, $invoice);
$count++; $count++;

37
app/Import/Transformer/Csv/InvoiceTransformer.php
View File

@ -167,24 +167,25 @@ class InvoiceTransformer extends BaseTransformer
), ),
], ],
]; ];
} elseif ( }
isset($transformed['amount']) && // elseif (
isset($transformed['balance']) && // isset($transformed['amount']) &&
$transformed['amount'] != $transformed['balance'] // isset($transformed['balance']) &&
) { // $transformed['amount'] != $transformed['balance']
$transformed['payments'] = [ // ) {
[ // $transformed['payments'] = [
'date' => isset($invoice_data['payment.date']) // [
? $this->parseDate($invoice_data['payment.date']) // 'date' => isset($invoice_data['payment.date'])
: date('y-m-d'), // ? $this->parseDate($invoice_data['payment.date'])
'transaction_reference' => $this->getString( // : date('y-m-d'),
$invoice_data, // 'transaction_reference' => $this->getString(
'payment.transaction_reference' // $invoice_data,
), // 'payment.transaction_reference'
'amount' => $transformed['amount'] - $transformed['balance'], // ),
], // 'amount' => $transformed['amount'] - $transformed['balance'],
]; // ],
} // ];
// }
$line_items = []; $line_items = [];
foreach ($line_items_data as $record) { foreach ($line_items_data as $record) {