mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Fixes for importing payments with non-transformed invoices
This commit is contained in:
parent
e1e1787d08
commit
ba5d2f8fc3
@ -1102,10 +1102,8 @@ class Import implements ShouldQueue
|
||||
|
||||
$modified['client_id'] = $this->transformId('clients', $resource['client_id']);
|
||||
$modified['user_id'] = $this->processUserId($resource);
|
||||
//$modified['invoice_id'] = $this->transformId('invoices', $resource['invoice_id']);
|
||||
$modified['company_id'] = $this->company->id;
|
||||
|
||||
//unset($modified['invoices']);
|
||||
unset($modified['invoice_id']);
|
||||
|
||||
if (isset($modified['invoices'])) {
|
||||
@ -1114,8 +1112,8 @@ class Import implements ShouldQueue
|
||||
$modified['invoices'][$key]['invoice_id'] = $this->transformId('invoices', $invoice['invoice_id']);
|
||||
} else {
|
||||
nlog($modified['invoices']);
|
||||
// $modified['credits'][$key]['credit_id'] = $this->transformId('credits', $invoice['invoice_id']);
|
||||
// $modified['credits'][$key]['amount'] = $modified['invoices'][$key]['amount'];
|
||||
unset($modified['invoices']);
|
||||
//if the transformation didn't work - you _must_ unset this data as it will be incorrect!
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -29,6 +29,7 @@ class PaymentType extends StaticModel
|
||||
const NOVA = 11;
|
||||
const CREDIT_CARD_OTHER = 12;
|
||||
const PAYPAL = 13;
|
||||
const CHECK = 15;
|
||||
const CARTE_BLANCHE = 16;
|
||||
const UNIONPAY = 17;
|
||||
const JCB = 18;
|
||||
|
Loading…
x
Reference in New Issue
Block a user