From dd59cb6de6c46f1dbfed351e0c712502d00cc941 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 18 May 2023 09:19:01 +1000
Subject: [PATCH] Fixes for recurring expense payment dates

---
 app/Factory/RecurringExpenseToExpenseFactory.php     | 2 +-
 app/Http/Controllers/DocumentController.php          | 7 +++++--
 app/Http/Requests/Document/UpdateDocumentRequest.php | 4 +++-
 app/Jobs/Cron/RecurringExpensesCron.php              | 7 +------
 app/Transformers/AccountTransformer.php              | 2 ++
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/app/Factory/RecurringExpenseToExpenseFactory.php b/app/Factory/RecurringExpenseToExpenseFactory.php
index 1fc9626aa72e..98c2a7beee6f 100644
--- a/app/Factory/RecurringExpenseToExpenseFactory.php
+++ b/app/Factory/RecurringExpenseToExpenseFactory.php
@@ -40,7 +40,7 @@ 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;
+        $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;
 
diff --git a/app/Http/Controllers/DocumentController.php b/app/Http/Controllers/DocumentController.php
index 20263da9d34b..7997de5101d0 100644
--- a/app/Http/Controllers/DocumentController.php
+++ b/app/Http/Controllers/DocumentController.php
@@ -145,8 +145,11 @@ class DocumentController extends BaseController
      * @return Response
      */
     public function update(UpdateDocumentRequest $request, Document $document)
-    {
-        return $this->itemResponse($document);
+    {   
+        $document->fill($request->all());
+        $document->save();
+
+        return $this->itemResponse($document->fresh());
     }
 
     /**
diff --git a/app/Http/Requests/Document/UpdateDocumentRequest.php b/app/Http/Requests/Document/UpdateDocumentRequest.php
index ff93a634cb37..9fc24354dfa0 100644
--- a/app/Http/Requests/Document/UpdateDocumentRequest.php
+++ b/app/Http/Requests/Document/UpdateDocumentRequest.php
@@ -30,7 +30,9 @@ class UpdateDocumentRequest extends Request
 
     public function rules()
     {
-        return [];
+        return [
+            'name' => 'sometimes|alpha_num'
+        ];
     }
 
     public function prepareForValidation()
diff --git a/app/Jobs/Cron/RecurringExpensesCron.php b/app/Jobs/Cron/RecurringExpensesCron.php
index 476f57e7ba81..796d38a3c49d 100644
--- a/app/Jobs/Cron/RecurringExpensesCron.php
+++ b/app/Jobs/Cron/RecurringExpensesCron.php
@@ -98,15 +98,10 @@ class RecurringExpensesCron
         }
     }
 
-    private function getRecurringExpenses()
-    {
-        //extracting this back to the if/else block to test duplicate crons
-    }
-
     private function generateExpense(RecurringExpense $recurring_expense)
     {
         $expense = RecurringExpenseToExpenseFactory::create($recurring_expense);
-        $expense->save();
+        $expense->saveQuietly();
 
         $expense->number = $this->getNextExpenseNumber($expense);
         $expense->save();
diff --git a/app/Transformers/AccountTransformer.php b/app/Transformers/AccountTransformer.php
index d7eaeb9d3fe2..6d433715c40a 100644
--- a/app/Transformers/AccountTransformer.php
+++ b/app/Transformers/AccountTransformer.php
@@ -90,6 +90,8 @@ class AccountTransformer extends EntityTransformer
             'set_react_as_default_ap' => (bool) $account->set_react_as_default_ap,
             'trial_days_left' => Ninja::isHosted() ? (int) $account->getTrialDays() : 0,
             'account_sms_verified' => (bool) $account->account_sms_verified,
+            'has_iap_plan' => (bool)$account->inapp_transaction_id,
+
         ];
     }