From d3c4e1080a91440f6191b67846a58d99d9f4d36c Mon Sep 17 00:00:00 2001 From: = Date: Fri, 27 Aug 2021 20:45:09 +1000 Subject: [PATCH] Fixes for Recurring Expense Transformer --- app/Jobs/Util/Import.php | 3 ++- app/Providers/EventServiceProvider.php | 1 + app/Transformers/ExpenseTransformer.php | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/Jobs/Util/Import.php b/app/Jobs/Util/Import.php index 664c09afa9b1..cbcc7bd30b7c 100644 --- a/app/Jobs/Util/Import.php +++ b/app/Jobs/Util/Import.php @@ -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']); diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index da39760ffa91..d993288a5fb8 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -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; diff --git a/app/Transformers/ExpenseTransformer.php b/app/Transformers/ExpenseTransformer.php index 21908884ba5e..4937fbb4f4fd 100644 --- a/app/Transformers/ExpenseTransformer.php +++ b/app/Transformers/ExpenseTransformer.php @@ -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', ]; } }