diff --git a/app/Controllers/PlanController.php b/app/Controllers/PlanController.php index a227dac..67647b2 100644 --- a/app/Controllers/PlanController.php +++ b/app/Controllers/PlanController.php @@ -1478,12 +1478,12 @@ class PlanController extends ResourceController public function url() { - echo '
';
- $user = $this->userModel->where('email', 'pavithrakavi1100@gmail.com')->first();
- echo getUserPlanCreationRestrictionStatus($user); die;
- print_r(getPlanApproverAction(126)); die;
+ // echo '';
+ // $user = $this->userModel->where('email', 'pavithrakavi1100@gmail.com')->first();
+ // echo getUserPlanCreationRestrictionStatus($user); die;
+ // print_r(getPlanApproverAction(126)); die;
- return $this->generatePlanPdf(57, true);
+ return $this->generatePlanPdf(136, true);
die;
updatePlanStatus(57); die;
diff --git a/app/Controllers/UserController.php b/app/Controllers/UserController.php
index 1cb2bd3..50596b9 100644
--- a/app/Controllers/UserController.php
+++ b/app/Controllers/UserController.php
@@ -656,7 +656,7 @@ public function userUpload()
{
$predefinedHeaders = ['First Name', 'Last Name', 'Email', 'Mobile Number', 'Password' , 'Role' ,'Employee Code','Group Name',
- 'First Approver Email','Second Approver Email','Third Approver Email','Exceptional Approver Email'];
+ 'First Approver Email','Second Approver Email','Third Approver Email','Fourth Approver Email'];
$uploadDir = WRITEPATH . 'uploads/userUploadFiles/';
diff --git a/app/Models/ReportsModel.php b/app/Models/ReportsModel.php
index 1316af3..64c41d3 100644
--- a/app/Models/ReportsModel.php
+++ b/app/Models/ReportsModel.php
@@ -419,7 +419,6 @@ class ReportsModel extends Model
WHERE cf.created_on >= DATE_SUB(CURDATE(), INTERVAL 7 DAY)
AND cf.created_on < DATE_ADD(CURDATE(), INTERVAL 1 DAY)
-
-- WHERE cf.created_on >= DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY)
-- AND cf.created_on < DATE_ADD(DATE_SUB(CURDATE(), INTERVAL WEEKDAY(CURDATE()) DAY), INTERVAL 7 DAY)
diff --git a/app/Views/pdf.php b/app/Views/pdf.php
index 006f386..0adb0bb 100644
--- a/app/Views/pdf.php
+++ b/app/Views/pdf.php
@@ -551,7 +551,7 @@
City
= esc($accomodationvalue['destination_city']) ?>
-
+
Hotel Name
= esc($accomodationvalue['hotel_name']) ?>
diff --git a/writable/uploads/template/.~lock.user_file.xlsx# b/writable/uploads/template/.~lock.user_file.xlsx#
new file mode 100644
index 0000000..e871827
--- /dev/null
+++ b/writable/uploads/template/.~lock.user_file.xlsx#
@@ -0,0 +1 @@
+,smart,smart-Vostro-15-3568,07.08.2025 10:57,file:///home/smart/.config/libreoffice/4;
\ No newline at end of file
diff --git a/writable/uploads/template/user_file.xlsx b/writable/uploads/template/user_file.xlsx
index f5c70cb..9e9fd36 100644
Binary files a/writable/uploads/template/user_file.xlsx and b/writable/uploads/template/user_file.xlsx differ