Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixes for imports

Browse Source
This commit is contained in:
David Bomba 2023-08-14 07:38:17 +10:00
parent 68c817bdcd
commit fda2b1d4f0
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Repositories/Migration/InvoiceMigrationRepository.php
View File

@ -136,7 +136,11 @@ class InvoiceMigrationRepository extends BaseRepository
$state['finished_amount'] = $model->amount;
$model = $model->service()->applyNumber()->setReminder()->save();
$model = $model->service()->applyNumber()->save();
if ($class->name == Invoice::class) {
$model->service()->setReminder()->save();
}
if ($class->name == Invoice::class || $class->name == RecurringInvoice::class) {
if (($state['finished_amount'] != $state['starting_amount']) && ($model->status_id != Invoice::STATUS_DRAFT)) {

4
app/Utils/TemplateEngine.php
View File

@ -52,8 +52,8 @@ class TemplateEngine
public $template;
/** @var \App\Models\Invoice | \App\Models\Quote | \App\Models\Credit | \App\Models\PurchaseOrder | \App\Models\RecurringInvoice $entity_obj **/
private \App\Models\Invoice | \App\Models\Quote | \App\Models\Credit | \App\Models\PurchaseOrder | \App\Models\RecurringInvoice $entity_obj;
/** @var \App\Models\Invoice | \App\Models\Quote | \App\Models\Credit | \App\Models\PurchaseOrder | \App\Models\RecurringInvoice | \App\Models\Payment $entity_obj **/
private \App\Models\Invoice | \App\Models\Quote | \App\Models\Credit | \App\Models\PurchaseOrder | \App\Models\RecurringInvoice | \App\Models\Payment $entity_obj;
/** @var \App\Models\Company | \App\Models\Client | null $settings_entity **/
private $settings_entity;