Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for Recurring Expense Transformer

Browse Source
This commit is contained in:
= 2021-08-27 20:05:53 +10:00
parent c7ef40a7af
commit da2070af53
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Models/RecurringExpense.php
View File

@ -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',

8
app/Transformers/RecurringExpenseTransformer.php
View File

@ -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 ?: '',
];
}
}
}

1
database/migrations/2021_08_23_101529_recurring_expenses_schema.php
View File

@ -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();