diff --git a/app/Models/RecurringExpense.php b/app/Models/RecurringExpense.php index 87e8b6911243..8e766cc66bc1 100644 --- a/app/Models/RecurringExpense.php +++ b/app/Models/RecurringExpense.php @@ -57,7 +57,6 @@ class RecurringExpense extends BaseModel 'uses_inclusive_taxes', 'calculate_tax_by_amount', 'frequency_id', - 'start_date', 'last_sent_date', 'next_send_date', 'remaining_cycles', diff --git a/app/Transformers/RecurringExpenseTransformer.php b/app/Transformers/RecurringExpenseTransformer.php index f2da8f6a0831..1323421a3a97 100644 --- a/app/Transformers/RecurringExpenseTransformer.php +++ b/app/Transformers/RecurringExpenseTransformer.php @@ -80,7 +80,6 @@ class RecurringExpenseTransformer extends EntityTransformer 'transaction_reference' => (string) $recurring_expense->transaction_reference ?: '', 'transaction_id' => (string) $recurring_expense->transaction_id ?: '', 'date' => $recurring_expense->date ?: '', - //'recurring_expense_date' => $recurring_expense->date ?: '', 'number' => (string)$recurring_expense->number ?: '', 'payment_date' => $recurring_expense->payment_date ?: '', 'custom_value1' => $recurring_expense->custom_value1 ?: '', @@ -96,6 +95,11 @@ class RecurringExpenseTransformer extends EntityTransformer 'tax_amount3' => (float) $recurring_expense->tax_amount3, 'uses_inclusive_taxes' => (bool) $recurring_expense->uses_inclusive_taxes, 'calculate_tax_by_amount' => (bool) $recurring_expense->calculate_tax_by_amount, + 'entity_type' => 'recurringExpense', + 'frequency_id' => (string) $recurring_expense->frequency_id, + 'remaining_cycles' => (int) $recurring_expense->remaining_cycles, + 'last_sent_date' => $recurring_expense->last_sent_date ?: '', + 'next_send_date' => $recurring_expense->next_send_date ?: '', ]; } -} +} \ No newline at end of file diff --git a/database/migrations/2021_08_23_101529_recurring_expenses_schema.php b/database/migrations/2021_08_23_101529_recurring_expenses_schema.php index 42d90a8d6927..48ac3a54115e 100644 --- a/database/migrations/2021_08_23_101529_recurring_expenses_schema.php +++ b/database/migrations/2021_08_23_101529_recurring_expenses_schema.php @@ -64,7 +64,6 @@ class RecurringExpensesSchema extends Migration $table->text('transaction_reference')->nullable(); $table->unsignedInteger('frequency_id'); - $table->datetime('start_date')->nullable(); $table->datetime('last_sent_date')->nullable(); $table->datetime('next_send_date')->nullable(); $table->unsignedInteger('remaining_cycles')->nullable();