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

Fixes for auto bill status of recurring invoices

Browse Source
This commit is contained in:
= 2021-09-11 21:05:35 +10:00
parent e3039763c6
commit e751a1ddbf
1 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/Traits/GenerateMigrationResources.php
View File

@ -791,7 +791,8 @@ trait GenerateMigrationResources
'due_date_days' => $this->transformDueDate($invoice), 'due_date_days' => $this->transformDueDate($invoice),
'remaining_cycles' => $this->getRemainingCycles($invoice), 'remaining_cycles' => $this->getRemainingCycles($invoice),
'invitations' => $this->getResourceInvitations($invoice->invitations, 'recurring_invoice_id'), 'invitations' => $this->getResourceInvitations($invoice->invitations, 'recurring_invoice_id'),
'auto_bill_enabled' => $invoice->auto_bill, 'auto_bill_enabled' => $this->calcAutoBillEnabled($invoice),
'auto_bill' => $this->calcAutoBill($invoice),
]; ];
} }
@ -799,6 +800,29 @@ trait GenerateMigrationResources
} }
private function calcAutoBillEnabled($invoice)
{
if($invoice->auto_bill == 1)
return 'off';
elseif($invoice->auto_bill == 2)
return 'optin';
elseif($invoice->auto_bill == 3)
return 'optout';
elseif($invoice->auto_bill == 4)
return 'always';
else
return 'off';
}
private function calcAutoBill($invoice)
{
if($invoice->auto_bill == 4)
return 1;
return $invoice->client_enable_auto_bill;
}
private function getNextSendDateForMigration($invoice) private function getNextSendDateForMigration($invoice)
{ {
@ -1213,7 +1237,7 @@ trait GenerateMigrationResources
'tax_name2' => $quote->tax_name2, 'tax_name2' => $quote->tax_name2,
'tax_rate1' => $quote->tax_rate1, 'tax_rate1' => $quote->tax_rate1,
'tax_rate2' => $quote->tax_rate2, 'tax_rate2' => $quote->tax_rate2,
'invoice_id' => $quote->quote_invoice_id, 'invoice_id' => Quote::getPrivateId($quote->quote_invoice_id),
'custom_surcharge1' => $quote->custom_value1 ?: '', 'custom_surcharge1' => $quote->custom_value1 ?: '',
'custom_surcharge2' => $quote->custom_value2 ?: '', 'custom_surcharge2' => $quote->custom_value2 ?: '',
'custom_value1' => $quote->custom_text_value1 ?: '', 'custom_value1' => $quote->custom_text_value1 ?: '',