From 34f2b04e33c137e1df150f24301434fe9bc5885c Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sun, 30 Jul 2023 08:10:41 +1000 Subject: [PATCH] Updates for recurring expense payment dates --- app/Factory/RecurringExpenseToExpenseFactory.php | 5 +---- app/Jobs/Cron/RecurringExpensesCron.php | 5 ++++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/Factory/RecurringExpenseToExpenseFactory.php b/app/Factory/RecurringExpenseToExpenseFactory.php index 82ea9224f75a..1f162eb8d73c 100644 --- a/app/Factory/RecurringExpenseToExpenseFactory.php +++ b/app/Factory/RecurringExpenseToExpenseFactory.php @@ -40,16 +40,13 @@ class RecurringExpenseToExpenseFactory $expense->tax_name3 = $recurring_expense->tax_name3; $expense->tax_rate3 = $recurring_expense->tax_rate3; $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->foreign_amount = $recurring_expense->foreign_amount ?: 0; //11-09-2022 - we should be tracking the recurring expense!! $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->private_notes = self::transformObject($recurring_expense->private_notes, $recurring_expense); diff --git a/app/Jobs/Cron/RecurringExpensesCron.php b/app/Jobs/Cron/RecurringExpensesCron.php index 796d38a3c49d..b3f785444a5c 100644 --- a/app/Jobs/Cron/RecurringExpensesCron.php +++ b/app/Jobs/Cron/RecurringExpensesCron.php @@ -103,8 +103,11 @@ class RecurringExpensesCron $expense = RecurringExpenseToExpenseFactory::create($recurring_expense); $expense->saveQuietly(); + if($expense->company->mark_expenses_paid) + $expense->payment_date = now()->format('Y-m-d'); + $expense->number = $this->getNextExpenseNumber($expense); - $expense->save(); + $expense->saveQuietly(); $recurring_expense->next_send_date = $recurring_expense->nextSendDate(); $recurring_expense->next_send_date_client = $recurring_expense->next_send_date;