From 26227b51f437f0e5fac43fb674b682d37bfe6d97 Mon Sep 17 00:00:00 2001
From: suseendhiran17 <58357088+suseendhiran17@users.noreply.github.com>
Date: Sat, 21 Jan 2023 17:19:35 +0530
Subject: [PATCH] feedback changes done : suseendhiran
---
.../modules/Asset/views/asset_list.php | 4 ++
.../Asset/views/asset_sub_value_list.php | 19 ++++++-
.../modules/Asset/views/edit_asset.php | 37 ++++++++++++--
.../modules/Business/controllers/Business.php | 2 +-
.../modules/Dashboard/views/dashboard.php | 20 ++++++--
.../Layout/views/includes/default_menu.php | 6 ++-
application/modules/User/controllers/User.php | 12 +++--
.../modules/User/models/User_model.php | 5 +-
application/modules/User/views/add_user.php | 9 ++--
.../modules/User/views/change_password.php | 33 +++++++++++-
application/modules/User/views/user_list.php | 12 +++++
assets/default/customize/ajax.js | 48 ++++++++++--------
assets/uploads/Screenshot_(223).png | Bin 0 -> 482691 bytes
assets/uploads/Screenshot_(232).png | Bin 0 -> 447677 bytes
assets/uploads/Screenshot_(234).png | Bin 0 -> 872150 bytes
assets/uploads/Screenshot_(237).png | Bin 0 -> 215949 bytes
assets/uploads/defauld-img1.jpg | Bin 0 -> 5380 bytes
assets/uploads/defauld-img2.jpg | Bin 0 -> 5380 bytes
assets/uploads/logo/Screenshot_(270).png | Bin 0 -> 216912 bytes
.../profile_picture/Screenshot_(237)3.png | Bin 0 -> 215949 bytes
.../uploads/profile_picture/defauld-img.jpg | Bin 0 -> 5380 bytes
.../uploads/profile_picture/defauld-img1.jpg | Bin 0 -> 5380 bytes
.../uploads/profile_picture/defauld-img11.jpg | Bin 0 -> 5380 bytes
.../istockphoto-1322913815-612x6121.jpg | Bin 0 -> 40125 bytes
24 files changed, 164 insertions(+), 43 deletions(-)
create mode 100644 assets/uploads/Screenshot_(223).png
create mode 100644 assets/uploads/Screenshot_(232).png
create mode 100644 assets/uploads/Screenshot_(234).png
create mode 100644 assets/uploads/Screenshot_(237).png
create mode 100644 assets/uploads/defauld-img1.jpg
create mode 100644 assets/uploads/defauld-img2.jpg
create mode 100644 assets/uploads/logo/Screenshot_(270).png
create mode 100644 assets/uploads/profile_picture/Screenshot_(237)3.png
create mode 100644 assets/uploads/profile_picture/defauld-img.jpg
create mode 100644 assets/uploads/profile_picture/defauld-img1.jpg
create mode 100644 assets/uploads/profile_picture/defauld-img11.jpg
create mode 100644 assets/uploads/profile_picture/istockphoto-1322913815-612x6121.jpg
diff --git a/application/modules/Asset/views/asset_list.php b/application/modules/Asset/views/asset_list.php
index 86ac87a..da91a48 100644
--- a/application/modules/Asset/views/asset_list.php
+++ b/application/modules/Asset/views/asset_list.php
@@ -8,7 +8,9 @@
+ action_permit != 'view' ) { ?>
Add Asset
+
Remove
View QR
+ action_permit != 'view' ) { ?>
+
diff --git a/application/modules/Asset/views/asset_sub_value_list.php b/application/modules/Asset/views/asset_sub_value_list.php
index e2f962f..53d4e98 100644
--- a/application/modules/Asset/views/asset_sub_value_list.php
+++ b/application/modules/Asset/views/asset_sub_value_list.php
@@ -37,8 +37,10 @@
@@ -63,6 +65,7 @@
current_value; ?>
percentage; ?>
description; ?>
+ action_permit != 'view' ) { ?>
@@ -72,6 +75,7 @@
+
@@ -85,8 +89,10 @@
@@ -108,13 +114,14 @@
date_to); ?>
quater; ?>
shift; ?>
+ action_permit != 'view' ) { ?>
asset_id;?>" style="font-size: 16px;" >
-
+
@@ -127,8 +134,10 @@
@@ -153,6 +162,7 @@
valid_to); ?>
valid_to)." days left"; ?>
description; ?>
+ action_permit != 'view' ) { ?>
@@ -160,6 +170,7 @@
asset_id;?>" style="font-size: 16px;">
+
@@ -172,8 +183,10 @@
@@ -198,6 +211,7 @@
valid_to); ?>
valid_to)." days left"; ?>
description; ?>
+ action_permit != 'view' ) { ?>
@@ -205,6 +219,7 @@
asset_id;?>" style="font-size: 16px;">
+
@@ -216,8 +231,10 @@
diff --git a/application/modules/Asset/views/edit_asset.php b/application/modules/Asset/views/edit_asset.php
index 41dc9f7..70ce0a2 100644
--- a/application/modules/Asset/views/edit_asset.php
+++ b/application/modules/Asset/views/edit_asset.php
@@ -101,8 +101,7 @@
Order Related Information
@@ -159,13 +158,21 @@
Main Image
+
asset_img == null || $editData->asset_img == '') { ?>
+
-
+
+asset_img == null || $editData->asset_img == '') { ?>
+
+
+
+
+
@@ -211,3 +218,27 @@
+
+
+
diff --git a/application/modules/Business/controllers/Business.php b/application/modules/Business/controllers/Business.php
index e18df50..0a50e1c 100644
--- a/application/modules/Business/controllers/Business.php
+++ b/application/modules/Business/controllers/Business.php
@@ -100,7 +100,7 @@ public function create_business()
$test = $this->audit->create_history('insert');
}
//print_r($create_business); die();
- $create_business = 3;
+ // $create_business = 3;
if($add_admin == 1)
{
redirect('user/addUser/'.$create_business);
diff --git a/application/modules/Dashboard/views/dashboard.php b/application/modules/Dashboard/views/dashboard.php
index 25a19b2..70eea93 100644
--- a/application/modules/Dashboard/views/dashboard.php
+++ b/application/modules/Dashboard/views/dashboard.php
@@ -111,7 +111,7 @@
$date1 = new DateTime($value->valid_to); //current date or any date
$date2 = new DateTime(date('d-m-Y')); //Future date
$diff = $date2->diff($date1)->format("%a"); //find difference
- $days = - intval($diff); //rounding days
+ $days = "Expired"; //rounding days
$days_count = 100;
//it return 365 days omitting current day
}
@@ -143,7 +143,14 @@
-
+
+
+
+
@@ -196,7 +203,7 @@
$date1 = new DateTime($value->valid_to); //current date or any date
$date2 = new DateTime(date('d-m-Y')); //Future date
$diff = $date2->diff($date1)->format("%a"); //find difference
- $days = - intval($diff); //rounding days
+ $days = "Expired";
$days_count = 100;
//it return 365 days omitting current day
}
@@ -228,7 +235,12 @@
-
+
+
+
+
diff --git a/application/modules/Layout/views/includes/default_menu.php b/application/modules/Layout/views/includes/default_menu.php
index 0af7f38..d1e5cfd 100644
--- a/application/modules/Layout/views/includes/default_menu.php
+++ b/application/modules/Layout/views/includes/default_menu.php
@@ -53,7 +53,9 @@
Assets
@@ -66,11 +68,13 @@
-
+
Users
diff --git a/application/modules/User/controllers/User.php b/application/modules/User/controllers/User.php
index 92a6686..145abea 100644
--- a/application/modules/User/controllers/User.php
+++ b/application/modules/User/controllers/User.php
@@ -46,7 +46,7 @@ public function userList()
if (is_superadmin()) {
$user_list = $this->user_model->get_admin();
}
- else if(is_admin()) {
+ else if(is_admin() || is_user()) {
$user_list = $this->user_model->get_user( md5(user()->id) , user()->business_id);
}
$this->layout->set('tableData', $user_list);
@@ -203,11 +203,15 @@ public function check_password()
$data['password'] = hash_password($this->input->post('password'));
$table="users";
$userData = $this->MY_Model->edit_option($data, user()->id, $table);
- $this->session->sess_destroy();
- echo "success";
+ // $this->session->sess_destroy();
+ $data1['status'] = 'success';
+ $data1['csrf_hash'] = $this->security->get_csrf_hash();
+ echo json_encode($data1);
}
else{
- echo "fail";
+ $data['status'] = 'failed';
+ $data['csrf_hash'] = $this->security->get_csrf_hash();
+ echo json_encode($data);
}
}
diff --git a/application/modules/User/models/User_model.php b/application/modules/User/models/User_model.php
index 8bfaabc..b942f89 100644
--- a/application/modules/User/models/User_model.php
+++ b/application/modules/User/models/User_model.php
@@ -17,8 +17,9 @@ public function get_user($id , $business_id)
public function get_admin()
{
- $this->db->select('*');
- $this->db->from('users');
+ $this->db->select('a.* , business.business_name as business');
+ $this->db->from('users a');
+ $this->db->join('business', 'business.uid = a.business_id', 'left');
$this->db->where('role !=', 'sadmin');
// $this->db->order_by('id','ASC');
$query = $this->db->get();
diff --git a/application/modules/User/views/add_user.php b/application/modules/User/views/add_user.php
index 0a6f1e2..04679fe 100644
--- a/application/modules/User/views/add_user.php
+++ b/application/modules/User/views/add_user.php
@@ -90,7 +90,7 @@
Email*
-
+
@@ -99,7 +99,8 @@
Mobile*
-
+
Permission*
@@ -124,7 +125,7 @@
Password*
-
+
@@ -149,7 +150,7 @@