Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-30 23:04:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Updates for recurring expense payment dates

Browse Source
This commit is contained in:
David Bomba 2023-07-30 08:10:41 +10:00
parent 4869586832
commit 34f2b04e33
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/Factory/RecurringExpenseToExpenseFactory.php
View File

@ -40,16 +40,13 @@ class RecurringExpenseToExpenseFactory
$expense->tax_name3 = $recurring_expense->tax_name3; $expense->tax_name3 = $recurring_expense->tax_name3;
$expense->tax_rate3 = $recurring_expense->tax_rate3; $expense->tax_rate3 = $recurring_expense->tax_rate3;
$expense->date = now()->format('Y-m-d'); $expense->date = now()->format('Y-m-d');
$expense->payment_date = $recurring_expense->payment_date ?: now()->format('Y-m-d'); // $expense->payment_date = $recurring_expense->payment_date ?: now()->format('Y-m-d');
$expense->amount = $recurring_expense->amount; $expense->amount = $recurring_expense->amount;
$expense->foreign_amount = $recurring_expense->foreign_amount ?: 0; $expense->foreign_amount = $recurring_expense->foreign_amount ?: 0;
//11-09-2022 - we should be tracking the recurring expense!! //11-09-2022 - we should be tracking the recurring expense!!
$expense->recurring_expense_id = $recurring_expense->id; $expense->recurring_expense_id = $recurring_expense->id;
// $expense->private_notes = $recurring_expense->private_notes;
// $expense->public_notes = $recurring_expense->public_notes;
$expense->public_notes = self::transformObject($recurring_expense->public_notes, $recurring_expense); $expense->public_notes = self::transformObject($recurring_expense->public_notes, $recurring_expense);
$expense->private_notes = self::transformObject($recurring_expense->private_notes, $recurring_expense); $expense->private_notes = self::transformObject($recurring_expense->private_notes, $recurring_expense);

5
app/Jobs/Cron/RecurringExpensesCron.php
View File

@ -103,8 +103,11 @@ class RecurringExpensesCron
$expense = RecurringExpenseToExpenseFactory::create($recurring_expense); $expense = RecurringExpenseToExpenseFactory::create($recurring_expense);
$expense->saveQuietly(); $expense->saveQuietly();
if($expense->company->mark_expenses_paid)
$expense->payment_date = now()->format('Y-m-d');
$expense->number = $this->getNextExpenseNumber($expense); $expense->number = $this->getNextExpenseNumber($expense);
$expense->save(); $expense->saveQuietly();
$recurring_expense->next_send_date = $recurring_expense->nextSendDate(); $recurring_expense->next_send_date = $recurring_expense->nextSendDate();
$recurring_expense->next_send_date_client = $recurring_expense->next_send_date; $recurring_expense->next_send_date_client = $recurring_expense->next_send_date;