From 9f5224bc7388913225480471e57bad54bd6ecbdc Mon Sep 17 00:00:00 2001 From: glovetleong Date: Thu, 5 Aug 2021 09:48:27 +0800 Subject: [PATCH] contract obligation done status bug --- app/Http/Modules/User/ContractObligationModule.php | 3 +++ app/Http/Rules/User/ContractObligationDoneCheck.php | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/Http/Modules/User/ContractObligationModule.php b/app/Http/Modules/User/ContractObligationModule.php index dad5ffa..26bacbf 100644 --- a/app/Http/Modules/User/ContractObligationModule.php +++ b/app/Http/Modules/User/ContractObligationModule.php @@ -175,6 +175,7 @@ class ContractObligationModule extends BaseController $contract_obligation = ContractObligation::find($id); $contract_obligation->complete_status = config('constants.contract_obligation.complete_status.completed'); + $contract_obligation->completed_at = Carbon::now(); $contract_obligation->update(); // log @@ -182,6 +183,8 @@ class ContractObligationModule extends BaseController ContractObligationModule::updateDone($request, $hash_id); + $contract_obligation = ContractObligation::find($id); + DB::commit(); $query_string = General::getCachePerviousQuery('contract_obligation_query'); diff --git a/app/Http/Rules/User/ContractObligationDoneCheck.php b/app/Http/Rules/User/ContractObligationDoneCheck.php index fe4dec5..8757d3b 100644 --- a/app/Http/Rules/User/ContractObligationDoneCheck.php +++ b/app/Http/Rules/User/ContractObligationDoneCheck.php @@ -44,7 +44,6 @@ class ContractObligationDoneCheck implements Rule where('id', $id) ->first(); - $contract_obligation_must_complete = $contract_obligation->must_complete; $contract_obligation_complete_status = $contract_obligation->complete_status; if ($contract_obligation_must_complete == config('constants.contract_obligation.must_complete.complete')) {