Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 07:57:33 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for migrations

Browse Source
This commit is contained in:
David Bomba 2021-07-16 08:45:07 +10:00
parent f441166133
commit 7a07c3da1c
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Traits/GenerateMigrationResources.php
View File

@ -192,7 +192,7 @@ info("get company");
'payment_terms' => $this->account->payment_terms ?: '', 'payment_terms' => $this->account->payment_terms ?: '',
'reset_counter_frequency_id' => $this->account->reset_counter_frequency_id ? (string) $this->transformFrequencyId 'reset_counter_frequency_id' => $this->account->reset_counter_frequency_id ? (string) $this->transformFrequencyId
($this->account->reset_counter_frequency_id) : '0', ($this->account->reset_counter_frequency_id) : '0',
'payment_type_id' => $this->account->payment_type_id ? (string) $this->account->payment_type_id : '1', 'payment_type_id' => $this->account->payment_type_id ? (string) $this->transformPaymentType($this->account->payment_type_id) : '1',
'reset_counter_date' => $this->account->reset_counter_date ?: '', 'reset_counter_date' => $this->account->reset_counter_date ?: '',
'tax_name1' => $this->account->tax_name1 ?: '', 'tax_name1' => $this->account->tax_name1 ?: '',
'tax_rate1' => $this->account->tax_rate1 ?: 0, 'tax_rate1' => $this->account->tax_rate1 ?: 0,
@ -431,10 +431,6 @@ info("get company");
foreach($agts as $agt) { foreach($agts as $agt) {
$payment_method = $agt->default_payment_method; $payment_method = $agt->default_payment_method;
if(!$payment_method)
continue;
$contact = Contact::where('id', $payment_method->contact_id)->withTrashed()->first(); $contact = Contact::where('id', $payment_method->contact_id)->withTrashed()->first();
$transformed[] = [ $transformed[] = [
@ -1262,7 +1258,7 @@ info("get company");
{ {
switch ($payment_type_id) { switch ($payment_type_id) {
case PAYMENT_TYPE_CREDIT: case PAYMENT_TYPE_CREDIT:
return 1; return 32;
case PAYMENT_TYPE_ACH: case PAYMENT_TYPE_ACH:
return 4; return 4;
case PAYMENT_TYPE_VISA: case PAYMENT_TYPE_VISA:
@ -1283,6 +1279,8 @@ info("get company");
return 12; return 12;
case PAYMENT_TYPE_PAYPAL: case PAYMENT_TYPE_PAYPAL:
return 13; return 13;
case 16:
return 15;
case PAYMENT_TYPE_CARTE_BLANCHE: case PAYMENT_TYPE_CARTE_BLANCHE:
return 16; return 16;
case PAYMENT_TYPE_UNIONPAY: case PAYMENT_TYPE_UNIONPAY:
@ -1774,7 +1772,7 @@ info("translated gateway_type = {$translated_gateway_type}");
'invoice_documents' => $expense->invoice_documents, 'invoice_documents' => $expense->invoice_documents,
'invoice_id' => $expense->invoice_id, 'invoice_id' => $expense->invoice_id,
'payment_date' => $expense->payment_date, 'payment_date' => $expense->payment_date,
'payment_type_id' => $expense->payment_type_id, 'payment_type_id' => $this->transformPaymentType($expense->payment_type_id),
'private_notes' => $expense->private_notes, 'private_notes' => $expense->private_notes,
'public_notes' => $expense->public_notes, 'public_notes' => $expense->public_notes,
'recurring_expense_id' => $expense->recurring_expense_id, 'recurring_expense_id' => $expense->recurring_expense_id,