tim/invoiceninja
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes for Recurring Expense Transformer

Browse source
This commit is contained in:
= 2021-08-27 20:45:09 +10:00
parent da2070af53
commit d3c4e1080a
3 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/Jobs/Util/Import.php
View file

@ -132,8 +132,8 @@ class Import implements ShouldQueue
'projects',
'products',
'credits',
'invoices',
'recurring_invoices',
'invoices',
'quotes',
'payments',
'expense_categories',
@ -910,6 +910,7 @@ class Import implements ShouldQueue
}
$modified['client_id'] = $this->transformId('clients', $resource['client_id']);
$modified['recurring_id'] = $this->transformId('recurring_invoices', $resource['recurring_id']);
$modified['user_id'] = $this->processUserId($resource);
$modified['company_id'] = $this->company->id;
$modified['line_items'] = $this->cleanItems($modified['line_items']);

1
app/Providers/EventServiceProvider.php
View file

@ -179,6 +179,7 @@ use App\Listeners\Quote\QuoteEmailedNotification;
use App\Listeners\Quote\QuoteRestoredActivity;
use App\Listeners\Quote\QuoteViewedActivity;
use App\Listeners\Quote\ReachWorkflowSettings;
use App\Listeners\RecurringExpense\CreatedRecurringExpenseActivity;
use App\Listeners\RecurringInvoice\CreateRecurringInvoiceActivity;
use App\Listeners\RecurringInvoice\RecurringInvoiceArchivedActivity;
use App\Listeners\RecurringInvoice\RecurringInvoiceDeletedActivity;

1
app/Transformers/ExpenseTransformer.php
View file

@ -96,6 +96,7 @@ class ExpenseTransformer extends EntityTransformer
'tax_amount3' => (float) $expense->tax_amount3,
'uses_inclusive_taxes' => (bool) $expense->uses_inclusive_taxes,
'calculate_tax_by_amount' => (bool) $expense->calculate_tax_by_amount,
'entity_type' => 'expense',
];
}
}