diff --git a/app/Controllers/PlanController.php b/app/Controllers/PlanController.php index 4f6f3ff..333f266 100644 --- a/app/Controllers/PlanController.php +++ b/app/Controllers/PlanController.php @@ -506,7 +506,7 @@ class PlanController extends ResourceController palnStatusHandler($planId , $sendMailForEdit); //update plan status if all action null - updatePlanStatus($planId); + updatePlanStatus($planId,$json['created_by']); //generate pdf for creation and every updation on the plan $this->generatePlanPdf($planId,false); @@ -806,7 +806,7 @@ class PlanController extends ResourceController if($status) { //update plan status - updatePlanStatus($plan_id); + updatePlanStatus($plan_id,$user_id); //update pdf content $this->generatePlanPdf($plan_id); @@ -1494,6 +1494,8 @@ class PlanController extends ResourceController public function url() { + + return updatePlanStatus(170,1); die; // echo '
';
// $user = $this->userModel->where('email', 'pavithrakavi1100@gmail.com')->first();
// echo getUserPlanCreationRestrictionStatus($user); die;
@@ -1502,7 +1504,7 @@ class PlanController extends ResourceController
return $this->generatePlanPdf(136, true);
die;
- updatePlanStatus(57); die;
+ // updatePlanStatus(57); die;
palnStatusHandler(57, false); die;
@@ -1516,7 +1518,7 @@ class PlanController extends ResourceController
return send_email_agent(env('ORG_id') , 62);
- return updatePlanStatus(62);
+ // return updatePlanStatus(62);
}
diff --git a/app/Helpers/status_helper.php b/app/Helpers/status_helper.php
index cce4aad..fd15002 100644
--- a/app/Helpers/status_helper.php
+++ b/app/Helpers/status_helper.php
@@ -325,7 +325,7 @@ if (!function_exists('palnStatusHandler')) {
// }
if (!function_exists('updatePlanStatus')) {
- function updatePlanStatus($plan_id)
+ function updatePlanStatus($plan_id,$updated_by)
{
$planStatusModel = new PlanStatusModel();
@@ -369,19 +369,23 @@ if (!function_exists('updatePlanStatus')) {
}
+
$count = ( $a1ApproveCount + $a2ApproveCount + $a3ApproveCount + $a4ApproveCount);
$sum = ( $a1ApproveSum + $a2ApproveSum + $a3ApproveSum + $a4ApproveSum);
-
+ // dd($a1,$a2,$a3,$a4,$count,$sum);
if($count == $sum)
{
// Approved
- $planModel->set(['status'=>3])->where('plan_id',$plan_id)->update();
+ $planModel->set(['status'=>3,'updated_by'=>$updated_by])->where('plan_id',$plan_id)->update();
}else if($count != $sum && $sum > 0)
{
//Partially Approved
- $planModel->set(['status'=>2])->where('plan_id',$plan_id)->update();
+ $planModel->set(['status'=>2,'updated_by'=>$updated_by])->where('plan_id',$plan_id)->update();
+ // $planModel->updatePlan($plan_id, ['status'=>2]);
+ // $db = \Config\Database::connect();
+ // $db->table('m_plan')->where('plan_id', $plan_id)->update(['status' => 2]);
}
return true;