Travel-Spends/tstat_be
Travel-Spends/tstat_be
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GWM : tracker issue

Browse Source
This commit is contained in:
Gowtham M 2025-08-04 11:35:15 +05:30
parent 8a5a12430a
commit a832ea284c
5 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controllers/PlanController.php
View File

@ -1475,6 +1475,8 @@ class PlanController extends ResourceController
public function url()
{
echo '<pre>';
print_r(getPlanApproverAction(119)); die;
return $this->generatePlanPdf(57, true);
die;
@ -1485,7 +1487,7 @@ class PlanController extends ResourceController
echo '<pre>';
// sendPlanCreationMail(39);
print_r(getPlanApproverAction(52)); die;
// echo '<pre>';
// print_r(getAllowedClassForUser(2,4)['hotel']); die;

5
app/Helpers/common_helper.php
View File

@ -130,7 +130,10 @@ if (!function_exists('isFlightTripDataChanged')) {
}
// Step 1: Fetch old data from the model
$oldData = $model->whereIn('flight_id', $flightIds)->where('is_active', 1)->findAll();
if(!empty($flightIds))
$oldData = $model->whereIn('flight_id', $flightIds)->where('is_active', 1)->findAll();
else
$oldData = [];
if (!$oldData) {

19
app/Helpers/mail_helper.php
View File

@ -45,16 +45,24 @@ if (!function_exists('sendPlanCreationMail')) {
if ($value['is_action_done'] == 1) { continue; }
// Skip if action is None
if ($value['action'] === 'None') { continue; }
// mail success check
if ($value['is_mail_send'] === 1) { continue; }
// skip with below condition
if($mailOn == 'send_mail_to_only_approver' && $action['parallel_process_from'] == 1){ continue; }
if($value['action'] == 'Approval'){ $template = 'plan_creation_approval_notification_to_approver'; }else if($value['action'] == 'Notification'){ $template = 'plan_creation_notification_to_approver'; }
$userData = $userModel->where('user_id', $value['user_id'])->first();
$url = urlButton($planId, $value['user_id']);
send_email($userData['org_id'] , $userData['email'], $template , $userData , $planData, $url);
$res = send_email($userData['org_id'] , $userData['email'], $template , $userData , $planData, $url);
if($res['status'] = 'success')
{
$planStatusModel->set([ $value['mail_send_key'] => 1 ])->where('plan_id', $planId)->where('is_active', 1)->update();
}
// if action is notification update the action status as 1 (done)
$parallelProcessValue = $action['parallel_process_from'];
@ -187,7 +195,6 @@ if (!function_exists('sendPlanUpdationMail')) {
// Fetch user data
$userData = $userModel->where('user_id', $userId)->first();
// send mail to traveller
send_email($planData['org_id'] , $userData['email'], 'plan_updation_notification_to_traveller' , $userData , $planData);
@ -202,6 +209,8 @@ if (!function_exists('sendPlanUpdationMail')) {
if ($value['is_action_done'] == 1) { continue; }
// Skip if action is None
if ($value['action'] === 'None') { continue; }
// mail success check
if ($value['is_mail_send'] === 1) { continue; }
if($value['action'] == 'Approval'){ $template = 'plan_updation_approval_notification_to_approver'; }else if($value['action'] == 'Notification'){ $template = 'plan_updation_notification_to_approver'; }
@ -209,7 +218,11 @@ if (!function_exists('sendPlanUpdationMail')) {
$url = urlButton($planId, $value['user_id']);
send_email($userData['org_id'] , $userData['email'], $template , $userData , $planData, $url);
$res = send_email($userData['org_id'] , $userData['email'], $template , $userData , $planData, $url);
if($res['status'] = 'success')
{
$planStatusModel->set([ $value['mail_send_key'] => 1 ])->where('plan_id', $planId)->where('is_active', 1)->update();
}
// if action is notification update the action status as 1 (done)
$parallelProcessValue = $action['parallel_process_from'];

4
app/Helpers/status_helper.php
View File

@ -161,7 +161,6 @@ if (!function_exists('palnStatusHandler')) {
if ($is_data_edited == false) {
log_message('info', "Creating new plan status for plan_id: {$plan_id}");
$planStatusModel->insert($data);
echo $planStatusModel->db->getLastQuery();
} else {
$oldStatusData = $planStatusModel->where('plan_id', $plan_id)->where('is_active', 1)->first();
if ($oldStatusData) {
@ -743,6 +742,7 @@ if (!function_exists('getPlanApproverAction')) {
$actionField = "{$field}_action";
$idField = "{$field}_id";
$doneField = "is_{$field}_action_done";
$mailField = "is_{$field}_mail_send";
$record = $planStatusModel->where('plan_id', $plan_id)
->whereIn($actionField, ['Approval', 'Notification', 'None'])
@ -761,6 +761,8 @@ if (!function_exists('getPlanApproverAction')) {
'where_key' => $idField,
'action_key' => $actionField,
'action_done_key' => $doneField,
'mail_send_key' => $mailField,
'is_mail_send' => $record[$mailField],
];
}
}

8
app/Models/PlanStatusModel.php
View File

@ -12,10 +12,10 @@ class PlanStatusModel extends Model
protected $allowedFields = [
'plan_id',
'service_id',
'a1_id', 'a1_action', 'is_a1_action_done', 'a1_reject_reason', 'a1_action_done_on','a1_action_done_by',
'a2_id', 'a2_action', 'is_a2_action_done', 'a2_reject_reason', 'a2_action_done_on','a2_action_done_by',
'a3_id', 'a3_action', 'is_a3_action_done', 'a3_reject_reason', 'a3_action_done_on','a3_action_done_by',
'a4_id', 'a4_action', 'is_a4_action_done', 'a4_reject_reason', 'a4_action_done_on','a4_action_done_by',
'a1_id', 'a1_action', 'is_a1_action_done', 'a1_reject_reason', 'a1_action_done_on','a1_action_done_by','is_a1_mail_send',
'a2_id', 'a2_action', 'is_a2_action_done', 'a2_reject_reason', 'a2_action_done_on','a2_action_done_by','is_a2_mail_send',
'a3_id', 'a3_action', 'is_a3_action_done', 'a3_reject_reason', 'a3_action_done_on','a3_action_done_by','is_a3_mail_send',
'a4_id', 'a4_action', 'is_a4_action_done', 'a4_reject_reason', 'a4_action_done_on','a4_action_done_by','is_a4_mail_send',
'parallel_process_from',
'is_active',
'created_on', 'created_by'