diff --git a/app/Config/Routes.php b/app/Config/Routes.php
index 33bc631f..30f04bf9 100644
--- a/app/Config/Routes.php
+++ b/app/Config/Routes.php
@@ -74,6 +74,7 @@ $routes->get('exportcost', 'CostCenter::exportcost');
 $routes->get('assetListing', 'Assetdetails::assetListing');
 $routes->get('addasset', 'Assetdetails::addasset');
 $routes->get('assetdetails/editOldasset', 'Assetdetails::editOldasset');
+$routes->post('assetdetails/getpodetails', 'Assetdetails::getpodetails');
 // $routes->post('addNewasset', 'Assetdetails::addNewasset');
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'editOldasset', 'Assetdetails::editasset');
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'editOldasset/(:num)', 'Assetdetails::editasset/$1');
@@ -376,6 +377,7 @@ $routes->get('inprocess', 'Inprocess::index');
 // Sales Controller
 $routes->get('sales_dashboard', 'Sales::sales_dashboard');
 $routes->get('invoicedetails/ViewInvoice', 'Sales::ViewInvoice');
+$routes->get('getInvoiceAttachment', 'Sales::getInvoiceAttachments');
 $routes->get('getInvoiceAttachments', 'Sales::getInvoiceAttachments');
 $routes->get('deleteAttachment', 'Sales::deleteAttachment');
 $routes->post('saveAttachment', 'Sales::saveAttachment');
diff --git a/app/Controllers/Employeedetails.php b/app/Controllers/Employeedetails.php
index 0ab265e6..5769a066 100644
--- a/app/Controllers/Employeedetails.php
+++ b/app/Controllers/Employeedetails.php
@@ -201,11 +201,9 @@ class Employeedetails extends BaseController
 
   function AddNewEmployee()
   {
-    // print_r($this->request->getPost());die;
-
     $photo = $this->request->getFile('photo');
     $Picture = "";
-    if(isset($photoan)){
+    if (isset($photo)) {
       if ($photo->isValid() && !$photo->hasMoved()) {
         $uploadDir = ROOTPATH . 'public/uploads/images/';
         $allowedTypes = ['jpg', 'jpeg', 'png', 'gif'];
@@ -603,8 +601,7 @@ class Employeedetails extends BaseController
   /* To Update the employee details*/
   function UpdateEmployee()
   {
-    // echo "<pre>";
-    // print_r($this->request->getPost());die;
+
     $EmpId =  $this->request->getPost('employeeid');
 
     //$mail = $this->this->.post('emailid');
@@ -637,33 +634,43 @@ class Employeedetails extends BaseController
     $ModifyPictureName = $this->request->getPost('ModifyImage');
     $Picture = "";
     if ($PictureName != '') {
+     
       //echo  'Exists';
       //$Picture = $PictureName; 
       if (strlen((string)$ModifyPictureName) == 0) {
         //echo  'Exists But Not replace';
         $Picture = $PictureName;
       } else {
+        // echo "<pre>";
+        // // print_r($this->request->getPost());
+        // print_r($this->request->getFile('photo'));
+        // die;
         //echo  'Exists But Replace';
         //$Picture = $ModifyPictureName;
         //$Picture = $this->editimage($ModifyPictureName);  
         $photo = $this->request->getFile('ModifyImage');
-        if ($photo->isValid() && !$photo->hasMoved()) {
-          $uploadDir = ROOTPATH . 'public/uploads/images/';
-          $allowedTypes = ['jpg', 'jpeg', 'png', 'gif'];
-          if (in_array($photo->getExtension(), $allowedTypes)) {
-            $newName = $photo->getRandomName();
-            if (!is_dir($uploadDir)) {
-              mkdir($uploadDir, 0777, true);
+        if (!$photo || !$photo->isValid()) {
+            $photo = $this->request->getFile('photo');
+        }
+        if (isset($photo)) {
+          if ($photo->isValid() && !$photo->hasMoved()) {
+            $uploadDir = ROOTPATH . 'public/uploads/images/';
+            $allowedTypes = ['jpg', 'jpeg', 'png', 'gif'];
+            if (in_array($photo->getExtension(), $allowedTypes)) {
+              $newName = $photo->getRandomName();
+              if (!is_dir($uploadDir)) {
+                mkdir($uploadDir, 0777, true);
+              }
+              $photo->move($uploadDir, $newName);
+              $Picture = $newName;
             }
-            $photo->move($uploadDir, $newName);
-            $Picture = $newName;
           }
         }
       }
     } else {
       //echo  'Not Exists';
       $photo = $this->request->getFile('photo');
-      if(isset($photo)){
+      if (isset($photo)) {
         if ($photo->isValid() && !$photo->hasMoved()) {
           $uploadDir = ROOTPATH . 'public/uploads/images/';
           $allowedTypes = ['jpg', 'jpeg', 'png', 'gif'];
diff --git a/app/Controllers/Login.php b/app/Controllers/Login.php
index 410c9767..683ac74c 100644
--- a/app/Controllers/Login.php
+++ b/app/Controllers/Login.php
@@ -37,7 +37,9 @@ class Login extends BaseController
             return view('login');
         } else {
             // redirect('/dashboard');
-            return redirect()->to('/dashboard');
+            // return redirect()->to('/dashboard');
+            return redirect()->to('/sales_dashboard');
+            
         }
         
     }
@@ -53,7 +55,9 @@ class Login extends BaseController
             return view('login');
         } else {
             // return view('login');
-            return redirect()->to('/dashboard');
+            // return redirect()->to('/dashboard');
+            return redirect()->to('/sales_dashboard');
+
         }
     }
 
@@ -107,9 +111,11 @@ class Login extends BaseController
                 $DEPCode = $res->DEPCode;
 
                 if ($DEPCode == SECURITY) {
-                    return redirect()->to(site_url('/dashboard'));
+                    // return redirect()->to(site_url('/dashboard'));
+                    return redirect()->to(site_url('/sales_dashboard'));
                 } else {
-                    return redirect()->to(site_url('/dashboard'));
+                    return redirect()->to(site_url('/sales_dashboard'));
+                    // return redirect()->to(site_url('/dashboard'));
                 }
             }
         } else {
diff --git a/app/Controllers/Sales.php b/app/Controllers/Sales.php
index 01c0cf1a..a7f60b98 100644
--- a/app/Controllers/Sales.php
+++ b/app/Controllers/Sales.php
@@ -5,18 +5,21 @@ namespace App\Controllers;
 use App\Controllers\BaseController;
 
 use App\Models\Ipinvoice_model;
+use App\Models\Ipattachment_model;
 require_once 'vendor/autoload.php';
 
 
 class Sales extends BaseController
 {
     protected  $ipinvoice_model;
+    protected  $ipattachment_model;
     protected $session;
 
     public function __construct()
     {
         parent::__construct();
         $this->ipinvoice_model = new Ipinvoice_model();
+        $this->ipattachment_model = new Ipattachment_model();
         $this->session = session();
         $this->isLoggedIn();
     }
@@ -91,8 +94,7 @@ class Sales extends BaseController
     
     // Invoice Attachments 
     function getInvoiceAttachments(){
-            $data['invoiceAttachment'] = $this->ipinvoice_model->getinvoiceAttachment($this->request->getGet('invoice_id'));
-
+            $data['invoiceAttachment'] = $this->ipinvoice_model->getinvoiceAttachment($this->request->getGet('invoice_number'));
             return json_encode($data);
     }
     
diff --git a/app/Controllers/User.php b/app/Controllers/User.php
index 34702d83..b0640664 100644
--- a/app/Controllers/User.php
+++ b/app/Controllers/User.php
@@ -14,6 +14,7 @@ use App\Models\User_model;
 use App\Models\Ipinvoice_model;
 use App\Models\Ipattachment_model;
 use App\Models\Zohobooks_api_model;
+
 require_once 'vendor/autoload.php';
 
 /**
@@ -41,7 +42,7 @@ class User extends BaseController
     public function __construct()
     {
         parent::__construct();
-        
+
         $this->dahsboard_Model = new Dashboard_model();
         $this->costcenter_model = new Costcenter_model();
         $this->department_model = new Department_model();
@@ -62,7 +63,7 @@ class User extends BaseController
         $this->global['pageTitle'] = 'Dashboard';
 
         log_message('error', '#####Dashboard session name : ' . $this->session->get('name'));
-        
+
         $data['EmpCount'] = $this->employeedetails_model->getEmployeeCount();
 
         $data['UserCount'] = $this->dahsboard_Model->getUserCount();
@@ -107,20 +108,20 @@ class User extends BaseController
 
         $data['capitalbud'] = $this->dahsboard_Model->capitalbud();
 
-        $data['typebal'] = [];// $this->dahsboard_Model->typebal();
+        $data['typebal'] = []; // $this->dahsboard_Model->typebal();
 
 
         /* HR DASHBOARD Controller Start*/
         $data['totemp'] = $this->dahsboard_Model->totemp();
-        
+
         $data['totloan'] = $this->dahsboard_Model->totloan();
-        
+
         $data['totpay'] = $this->dahsboard_Model->totpay();
-        
+
         $data['totrec'] = $this->dahsboard_Model->totrec();
-        
+
         $data['emplist'] = $this->dahsboard_Model->emplist();
-        
+
 
         $date = $this->request->getPost("id");
         $dates = date('Y-m');
@@ -253,13 +254,12 @@ class User extends BaseController
         $working = array();
         $overtime = array();
         //$holid = array();
-        for ($i = 1; $i <= $dat; $i++) 
-        {
+        for ($i = 1; $i <= $dat; $i++) {
             $Working[] = 'WH' . $i;
             $overtime[] = 'OT' . $i;
 
             $CUR_month = date('t');
-            
+
             // foreach ($holiday as $value)
             //     {
             //        //$holid []= 'WH'.$value;
@@ -269,7 +269,7 @@ class User extends BaseController
             //     }
 
         }
-        
+
         $WH = implode(",", $Working);
 
         $OT = implode(",", $overtime);
@@ -315,19 +315,19 @@ class User extends BaseController
                         /**one hour salay ot calculation**/
                         $totSalayOT = ($totalothour != 0) ? $totalothour * $onehoursSalary : 0;
                         /** if ot not equal zero **/
-                        
+
                         $currentDaySalary = $daySalary * $values;
                         /** current day salary working days calculation**/
 
                         $currentDayHra = $dayHra * $values;
                         /** total working days hra calculations**/
-                        
+
                         $currentDatePF = $currentDaySalary + $currentDayHra + $totSalayOT;
                         /** current date pf calculation**/
-                        
+
                         $esiAmount = ($totalsalary <= 20000) ? $currentDatePF * 1.75 / 100 : 0;
                         /** esiamount not elgiable for 20000 **/
-                        
+
                         $pfAmount = $currentDaySalary * 12 / 100;
                         /** pf amount per day**/
 
@@ -338,7 +338,7 @@ class User extends BaseController
 
                         $totalSalary = round($totalSalarys);
                         // $salarycurrentdate[] = $salaryInCurrentday;;
-                        
+
                     }
                 }
             }
@@ -363,7 +363,7 @@ class User extends BaseController
         $WH = 'WH' . date('j', strtotime("-1 days"));
 
         $yesterday = $this->dahsboard_Model->attyesterday($WH, $date);
-        
+
         $values = 0;
         foreach ($yesterday as $weekda => $value) {
 
@@ -372,28 +372,28 @@ class User extends BaseController
                 $values++;
             }
         }
-        
+
         $data['values'] = $values;
 
 
 
 
         $date = $this->request->getPost("id");
-        
-        $daydate = format_date($date,0,'Y-m');
-        
+
+        $daydate = format_date($date, 0, 'Y-m');
+
         $daydate = $daydate . '-01';
-        
-        $WH = 'WH' . format_date($date,0,'j');
-        
+
+        $WH = 'WH' . format_date($date, 0, 'j');
+
         $yesterday = $this->dahsboard_Model->attyesterday($WH, $daydate);
 
         //$absEmp =array($absEmp);
         $values = 0;
         $absEmp = array();
-        
+
         foreach ($yesterday as $weekda => $value) {
-        
+
             if ($value[$WH] == 0) {
 
                 $values++;
@@ -403,14 +403,14 @@ class User extends BaseController
             }
         }
 
-        
+
         $data['today'] = $values;
         $data['absname'] = $absEmp;
 
-        $OT = 'OT' .format_date($date,0,'j');
+        $OT = 'OT' . format_date($date, 0, 'j');
 
         $CUR_month = date('t');
-        
+
         $toDayEmployee = $this->dahsboard_Model->dayAllPersentEmpSalary($WH, $OT, $daydate);
         //$EmpID = $toDayEmployee[0]->EmpID;
 
@@ -466,14 +466,14 @@ class User extends BaseController
 
                     $currentDatePF = $currentDaySalary + $currentDayHra + $totSalayOT;
                     /** current date pf calculation**/
-                    
+
                     $esiAmount = ($totalsalary <= 20000) ? $currentDatePF * 1.75 / 100 : 0;
                     /** esiamount not elgiable for 20000 **/
-                    
+
                     $pfAmount = $currentDaySalary * 12 / 100;
                     /** pf amount per day**/
 
-                    
+
                     $salaryInCurrentdays = $currentDaySalary + $totSalayOT + $currentDayHra + $Food_Allowances;
                     $salaryInCurrentday =  $salaryInCurrentdays - ($esiAmount + $pfAmount);
                     $employeeSalary += round($salaryInCurrentday);
@@ -488,7 +488,7 @@ class User extends BaseController
         $working = array();
         $overtime = array();
         //$holid = array();
-        $len = format_date($date,0,'d');
+        $len = format_date($date, 0, 'd');
         for ($i = 1; $i <= $len; $i++) //echo $dat; die;
         {
 
@@ -525,7 +525,7 @@ class User extends BaseController
 
                 if ($value[$work] != 0 || $value['OT' . substr($work, 2)] != 0) {
                     $totalothour = $value['OT' . substr($work, 2)];
-                  
+
                     $values = 1;
 
                     $Empid = $value['EmpID'];
@@ -551,10 +551,10 @@ class User extends BaseController
 
                         $onehoursSalary = ($daySalary + $dayHra) / 8;
                         /**one hour salay ot calculation**/
-                        
+
                         $totSalayOT =  ($totalothour != 0) ? $totalothour * $onehoursSalary : 0;
                         /** if ot not equal zero **/
-                        
+
                         $currentDaySalary = $daySalary * $values;
                         /** current day salary working days calculation**/
 
@@ -563,10 +563,10 @@ class User extends BaseController
 
                         $currentDatePF = $currentDaySalary + $currentDayHra + $totSalayOT;
                         /** current date pf calculation**/
-                        
+
                         $esiAmount = ($totalsalary <= 20000) ? $currentDatePF * 1.75 / 100 : 0;
                         /** esiamount not elgiable for 20000 **/
-                        
+
                         $pfAmount = $currentDaySalary * 12 / 100;
                         /** pf amount per day**/
 
@@ -633,7 +633,7 @@ class User extends BaseController
     {
 
         $date = date('Y-m');
-        
+
         $dates = $date . '-01';
         $EmpID = '';
         if (empty($empID)) {
@@ -641,7 +641,7 @@ class User extends BaseController
         } else {
             $EmpID = $empID;
         }
-        
+
         $monthabs = $this->dahsboard_Model->attendance($EmpID, $dates);
         $persent_month = date('t'); //current month of days 31
         $values = array();
@@ -700,11 +700,10 @@ class User extends BaseController
         $totalwhhours  = array_sum($values);
 
         $totalwhhour = $totalwhhours / 8;
-        
+
         if ($CURMONTH == $doj_month && $CURYEAR == $doj_year) {
-        
+
             $data['CUR_month'] = $CURDATE - $doj_day + 1;
-        
         } else {
             $data['CUR_month'] = $date;
         }
@@ -871,7 +870,7 @@ class User extends BaseController
             $TotalNoofDays = $TotalNoofDays + $CURDATE;
             $DaysWorked = $DaysWorked + $values;
             $final_res = round(($DaysWorked / $TotalNoofDays) * 100);
-            
+
             $data['workeds'] = $DaysWorked;
             $data['yeardata'] = $final_res;
             $data['totaldays'] = $TotalNoofDays;
@@ -926,7 +925,7 @@ class User extends BaseController
         // echo "<pre>";
         // print_r($data['Department']);
         // die;
-        
+
         // echo "<pre>";
         // print_r($data['Department']);die;
         $this->global['pageTitle'] = 'Add New User';
@@ -1009,7 +1008,7 @@ class User extends BaseController
         $email = $this->request->getPost('MailID');
         $SelectedDepartment = (string)$this->request->getPost('txtSelectedDepartment');
         $comma_separated = explode(':', $SelectedDepartment);
-        if(count($comma_separated)== 1 && in_array('DEP27', $comma_separated)){
+        if (count($comma_separated) == 1 && in_array('DEP27', $comma_separated)) {
             $roleId = '6';
         }
         $userInfo = [
@@ -1125,27 +1124,27 @@ class User extends BaseController
         // if ($this->validator->run() == FALSE) {
         //     $this->editOld($userId);
         // } else {
-            $EmpID = $this->request->getPost('EmpList');
-            $role = $this->request->getPost('role');
-            $password = $this->request->getPost('password');
-           
-            $updatedDate =  get_current_date_time();
+        $EmpID = $this->request->getPost('EmpList');
+        $role = $this->request->getPost('role');
+        $password = $this->request->getPost('password');
 
-            //    echo $EmpID;
+        $updatedDate =  get_current_date_time();
 
-            $userInfo = array();
+        //    echo $EmpID;
 
-            $userInfo = array('password' => getHashedPassword($password), 'roleId' => $role, 'EmpId' => $EmpID, 'updatedDtm' => $updatedDate);
+        $userInfo = array();
 
-            $result = $this->user_model->editUser($userInfo,  $EmpID);
+        $userInfo = array('password' => getHashedPassword($password), 'roleId' => $role, 'EmpId' => $EmpID, 'updatedDtm' => $updatedDate);
 
-            if ($result == true) {
-                $this->session->setFlashdata('success', 'User updated successfully');
-            } else {
-                $this->session->setFlashdata('error', 'User updation failed');
-            }
+        $result = $this->user_model->editUser($userInfo,  $EmpID);
 
-            return redirect()->route('userListing');
+        if ($result == true) {
+            $this->session->setFlashdata('success', 'User updated successfully');
+        } else {
+            $this->session->setFlashdata('error', 'User updation failed');
+        }
+
+        return redirect()->route('userListing');
         // }
         //}
     }
@@ -1159,7 +1158,7 @@ class User extends BaseController
     {
         echo 'Delete';
         $Uid = $this->request->getPost('id');
-        
+
         $updatedDate =  get_current_date_time();
 
         $userInfo = array('isDeleted' => 1, 'updatedBy' => $this->vendorId, 'updatedDtm' => $updatedDate);
@@ -1176,7 +1175,7 @@ class User extends BaseController
     {
         $this->global['pageTitle'] = 'Change Password';
 
-        $this->loadViews("changePassword", $this->global, NULL, NULL);
+        $this->loadViews("changePassword", $this->global, [], NULL);
     }
 
 
@@ -1187,29 +1186,27 @@ class User extends BaseController
     {
         helper('form'); //$this->load->library('form_validation');
 
-        $this->validator->setRules(['oldPassword', 'Old password'=> 'required|max_length[20]']);
-        $this->validator->setRules(['newPassword', 'New password'=> 'required|max_length[20]']);
-        $this->validator->setRules(['cNewPassword', 'Confirm new password'=> 'required|matches[newPassword]|max_length[20]']);
+        // $this->validator->setRules(['oldPassword', 'Old password'=> 'required|max_length[20]']);
+        // $this->validator->setRules(['newPassword', 'New password'=> 'required|max_length[20]']);
+        // $this->validator->setRules(['cNewPassword', 'Confirm new password'=> 'required|matches[newPassword]|max_length[20]']);
 
-        if ($this->validator->run() == FALSE) {
-            $this->loadChangePass();
-        } else {
+        // if ($this->validator->run() == FALSE) {
             $oldPassword = $this->request->getPost('oldPassword');
             $newPassword = $this->request->getPost('newPassword');
-
+            $cNewPassword = $this->request->getPost('newPassword');
+        if($newPassword === $cNewPassword && $oldPassword != $newPassword) {
             $resultPas = $this->user_model->matchOldPassword($this->vendorId, $oldPassword);
-
             if (empty($resultPas)) {
                 $this->session->setFlashdata('nomatch', 'Your old password not correct');
                 return redirect()->route('loadChangePass');
             } else {
                 $usersData = array(
-                    'password' => getHashedPassword($newPassword), 'updatedBy' => $this->vendorId,
+                    'password' => getHashedPassword($newPassword),
+                    'updatedBy' => $this->vendorId,
                     'updatedDtm' => date('Y-m-d H:i:sa')
                 );
-
+                $this->session->setFlashdata('error', 'Password updation failed');
                 $result = $this->user_model->changePassword($this->vendorId, $usersData);
-
                 if ($result > 0) {
                     $this->session->setFlashdata('success', 'Password updation successful');
                 } else {
@@ -1236,7 +1233,6 @@ class User extends BaseController
 
             $data['fy'] = $this->user_model->fincalYear();
             $data['per'] = $this->user_model->deliver_perform($fa, $aa, $m);
-
         }
 
         $data['fy'] = $this->user_model->fincalYear();
@@ -1265,7 +1261,7 @@ class User extends BaseController
         $status = $this->request->getPost('status');
         $CreateBy = $this->session->get('userId');
 
-        
+
         $createddt =  get_current_date_time();
         $menu = $this->request->getPost('menu');
         // $RowCount =  $this->request->getPost('txtRowCount'); 
@@ -1273,7 +1269,7 @@ class User extends BaseController
         // $comma_separated = explode(':', $DeletedRow); 
         $favourite = array('Menu_Name' => $name, 'Menu_URL' => $url, 'Status' => $status, 'Created_BY' => $CreateBy, 'Created_ON' => $createddt, 'Menu_ID' => $menu);
         $getdata = $this->user_model->favouriteadd($favourite);
-        
+
         if ($getdata == 1) {
             echo "success";
         } else {
@@ -1281,380 +1277,358 @@ class User extends BaseController
         }
     }
 
-    function zohobooks_api_fetch_all(){
+    function zohobooks_api_fetch_all()
+    {
         //  print_r($_GET);
         // echo isset($_GET['from']) ? $_GET['from'] : 'n';
         // echo isset($_GET['to']) ? $_GET['to'] : 'n';
         // die();
-        try{
+        try {
             // if (isset($_POST['sync']) || $_GET['from'] != null && $_GET['to'] != null) 
             // {
-                // $ch=curl_init();
-                //$this->load->helper('zohobooks_fetch_api_helper');
-                helper('zohobook');
-                $Zohobook_model = model('Zohobook_api_model');
-                if(isset($_GET['from']) && $_GET['from'] != null && isset($_GET['to']) && $_GET['to'] != null)
-                {
-                    $date_today = $_GET['to'];
-                    $date_yesterday = $_GET['from'];
+            // $ch=curl_init();
+            //$this->load->helper('zohobooks_fetch_api_helper');
+            helper('zohobook');
+            $Zohobook_model = model('Zohobook_api_model');
+            if (isset($_GET['from']) && $_GET['from'] != null && isset($_GET['to']) && $_GET['to'] != null) {
+                $date_today = $_GET['to'];
+                $date_yesterday = $_GET['from'];
+            } else {
+                $date_today = date('Y-m-d');
+                $date_yesterday = date('Y-m-d', strtotime('-3 day', strtotime($date_today)));
+            }
+            // echo $date_today.'--'.$date_yesterday;die;
+            $chk_acc_token_val = $Zohobook_model->get_data('zohobook_accesstoken', 'id', 1);
+            // print_r($chk_acc_token_val);//die();
+            $date = new \DateTime($chk_acc_token_val[0]['created_at']);
+            //print_r($date);
+            $date->add(new \DateInterval('PT1H'));
+            //print_r($date);
+            //echo '****************';
+            //print_r(date('Y-m-d h:i:s'));
+            $token = 0;
+            if ($date->format('Y-m-d H:i:s') > date('Y-m-d H:i:s')) {
+                $token = $chk_acc_token_val[0]['token'];
+            } else {
+                $token = generateNewToken();
+                $tokendata['token'] = $token;
+                $Zohobook_model->customUpdate($tokendata, 1, 'zohobook_accesstoken');
+            }
+            // $token = generateNewToken(); $tokendata['token'] = $token; 
+            //$Zohobook_model->update($tokendata , 1,'zohobook_accesstoken');  
+            $result = getheringInvoiceDetails($date_today, $date_yesterday, $token);
+            $headers_new = $result['headers_new'];
+            $res = json_decode($result['data'], true);
+            $inv_array = $res['invoices'];
+            // print_r($inv_array);
+            // echo "rrrr";
+            // die();
+            foreach ($inv_array as $inv) {
+                $invoice_id = $inv['invoice_id'];
+                //filter only einvoice status pushed invoices only
+                //&& isset($inv['einvoice_details']) && isset($inv['einvoice_details']['status']) && ($inv['einvoice_details']['status'] == 'pushed')
+                if ($invoice_id !== "") {
+                    $organization_id = '776847408';
+                    $result2 = getheringInvoiceSubDetails($invoice_id, $organization_id, $headers_new);
+                    $resall = json_decode($result2, true);
+                    $res2[] = $resall['invoice'];
                 }
-                else
-                {
-                    $date_today = date('Y-m-d');
-                    $date_yesterday = date('Y-m-d',strtotime('-3 day',strtotime($date_today)));
-                }
-                // echo $date_today.'--'.$date_yesterday;die;
-                $chk_acc_token_val = $Zohobook_model->get_data('zohobook_accesstoken','id' , 1);
-                // print_r($chk_acc_token_val);//die();
-                $date = new \DateTime($chk_acc_token_val[0]['created_at']); 
-                //print_r($date);
-                $date->add(new \DateInterval('PT1H'));
-                //print_r($date);
-                //echo '****************';
-                //print_r(date('Y-m-d h:i:s'));
-                $token = 0;
-                if ($date->format('Y-m-d H:i:s') > date('Y-m-d H:i:s')) {  $token = $chk_acc_token_val[0]['token']; } 
-                else { $token = generateNewToken(); $tokendata['token'] = $token; $Zohobook_model->customUpdate($tokendata , 1,'zohobook_accesstoken'); }
-                    // $token = generateNewToken(); $tokendata['token'] = $token; 
-                    //$Zohobook_model->update($tokendata , 1,'zohobook_accesstoken');  
-                    $result = getheringInvoiceDetails($date_today , $date_yesterday , $token);
-                    $headers_new = $result['headers_new'];
-                    $res = json_decode($result['data'],true);
-                    $inv_array = $res['invoices'];
-                    // print_r($inv_array);
-                    // echo "rrrr";
-                    // die();
-                    foreach($inv_array as $inv){
-                        $invoice_id = $inv['invoice_id'];
-                        //filter only einvoice status pushed invoices only
-                        //&& isset($inv['einvoice_details']) && isset($inv['einvoice_details']['status']) && ($inv['einvoice_details']['status'] == 'pushed')
-                        if($invoice_id !== "" ){
-                            $organization_id = '776847408';
-                            $result2=getheringInvoiceSubDetails($invoice_id,$organization_id,$headers_new);
-                            $resall = json_decode($result2,true);
-                            $res2[] = $resall['invoice'];
-                        }
+            }
+            $insert_count = 0;
+            $update_count = 0;
+            foreach ($res2 as $rs) {
+                $gst_no = $rs['gst_no'];
+                $invoice_number = $rs['invoice_number'];
+                $invoice_date = $rs['date'];
+                $status = $rs['status'];
+                $due_date = $rs['due_date'];
+                $invoice_url = $rs['invoice_url'];
+                $einvoice_number = $rs['einvoice_details']['inv_ref_num'];
+
+                $invoice_time = $rs['created_time'];
+                $time_array = explode("T", $invoice_time);
+                $time_array = explode("+", $time_array[1]);
+                $invoice_time = $time_array[0];
+
+                $sql_invoice_chk = $Zohobook_model->ip_invoices($invoice_number, $invoice_date);
+                if ($sql_invoice_chk <= 0) {
+
+                    $gst_sql = $Zohobook_model->ip_clients($gst_no);
+                    if ($gst_sql) {
+                        $client_id = $gst_sql[0]['client_id'];
+                        log_message('error', 'Data fetch success DB : ip_clients , client_id : ' . $client_id);
+                    } else {
+                        log_message('error', 'No data => Data fetch failed DB : ip_clients ' . $gst_no);
+                        $gst_no_data['client_tax_code'] = $gst_no;
+                        $gst_inserted_id = $Zohobook_model->customInsert($gst_no_data, 'ip_clients');
+                        $client_id = $gst_inserted_id;
+                        log_message('error', 'New Data Created : DB : ip_clients , client_id : ' . $client_id);
                     }
-                    $insert_count = 0;
-                    $update_count = 0;
-                    foreach($res2 as $rs)
-                    {
-                        $gst_no = $rs['gst_no'];
-                        $invoice_number = $rs['invoice_number'];
-                        $invoice_date = $rs['date']; 
-                        $status = $rs['status'];
-                        $due_date = $rs['due_date'];
-                        $invoice_url = $rs['invoice_url'];
-                        $einvoice_number = $rs['einvoice_details']['inv_ref_num'];
 
-                            $invoice_time=$rs['created_time'];
-                            $time_array = explode("T", $invoice_time);
-                            $time_array = explode("+",$time_array[1]);
-                            $invoice_time = $time_array[0];
-                        
-                        $sql_invoice_chk = $Zohobook_model->ip_invoices($invoice_number , $invoice_date);
-                        if($sql_invoice_chk <= 0)
-                        {  
 
-                                $gst_sql = $Zohobook_model->ip_clients($gst_no);
-                                if($gst_sql)
-                                {
-                                    $client_id = $gst_sql[0]['client_id'];
-                                    log_message('error', 'Data fetch success DB : ip_clients , client_id : '.$client_id);
+                    $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+                    $charactersLength = strlen($characters);
+                    $randomString = '';
+                    for ($i = 0; $i < 16; $i++) {
+                        $randomString .= $characters[rand(0, $charactersLength - 1)];
+                    }
+                    $url_key = $randomString;
+
+                    $ip_invoices['user_id'] = 1;
+                    $ip_invoices['client_id'] = $client_id;
+                    $ip_invoices['invoice_group_id'] = 6;
+                    $ip_invoices['invoice_status_id'] = ($status == 'draft' ? 1 : (($status == 'sent' || $status == 'overdue') ? 2 : 5));
+                    $ip_invoices['invoice_date_created'] = $invoice_date;
+                    $ip_invoices['invoice_time_created'] = $invoice_time;
+                    $ip_invoices['invoice_date_due'] = $due_date;
+                    $ip_invoices['invoice_number'] = $invoice_number;
+                    $ip_invoices['invoice_url_key'] = $url_key;
+                    $ip_invoices['receivedstatus'] = 'ST066';
+                    $ip_invoices['credit_status'] = 0;
+                    $ip_invoices['status'] = $status;
+                    $ip_invoices['e_invoice_number'] = $einvoice_number;
+                    $ip_invoices['invoice_url'] = $invoice_url;
+                    $invoice_insert_id = $Zohobook_model->customInsert($ip_invoices, 'ip_invoices');
+                    if ($invoice_insert_id) {
+                        log_message('error', 'Data insert success DB : ip_invoices client id :' . $client_id);
+                        $insert_count = $insert_count + 1;
+                        //start invoice level custom fields
+
+                        //custom fields insert
+
+                        $batch_no = isset($rs['custom_fields'][5]['value']) ? $rs['custom_fields'][5]['value'] : "";
+                        // $batch_no = "";
+                        $vehicle_number = isset($rs['custom_field_hash']['cf_vehicle_number']) ? $rs['custom_field_hash']['cf_vehicle_number'] : '';
+                        $transport_mode = isset($rs['custom_field_hash']['cf_transport_mode']) ? $rs['custom_field_hash']['cf_transport_mode'] : '';
+                        $purchase_order_date = isset($rs['custom_field_hash']['cf_purchase_order_date']) ? $rs['custom_field_hash']['cf_purchase_order_date'] : '';
+                        $driver = isset($rs['custom_field_hash']['cf_driver']) ? $rs['custom_field_hash']['cf_driver'] : '';
+                        $place_of_supply = isset($rs['custom_field_hash']['cf_place_of_supply']) ? $rs['custom_field_hash']['cf_place_of_supply'] : '';
+                        // batch_no
+                        $ip_invoice_custom_b['invoice_id'] = $invoice_insert_id;
+                        $ip_invoice_custom_b['invoice_custom_fieldid'] = 62;
+                        $ip_invoice_custom_b['invoice_custom_fieldvalue'] = $batch_no;
+                        $result_invoice_custom_insert = $Zohobook_model->customInsert($ip_invoice_custom_b, 'ip_invoice_custom');
+                        if ($result_invoice_custom_insert)
+                            log_message('error', 'Data insert success DB : ip_invoice_custom ');
+                        else
+                            log_message('error', 'Data insert failed DB : ip_invoice_custom ');
+                        // vehicle_number
+                        $ip_invoice_custom_v['invoice_id'] = $invoice_insert_id;
+                        $ip_invoice_custom_v['invoice_custom_fieldid'] = 8;
+                        $ip_invoice_custom_v['invoice_custom_fieldvalue'] = $vehicle_number;
+                        $res_vehicle = $Zohobook_model->customInsert($ip_invoice_custom_v, 'ip_invoice_custom');
+                        if ($res_vehicle)
+                            log_message('error', 'Data insert success DB : ip_invoice_custom ');
+                        else
+                            log_message('error', 'Data insert failed DB : ip_invoice_custom ');
+                        // transport_mode
+                        $ip_invoice_custom_t['invoice_id'] = $invoice_insert_id;
+                        $ip_invoice_custom_t['invoice_custom_fieldid'] = 7;
+                        $ip_invoice_custom_t['invoice_custom_fieldvalue'] = $transport_mode;
+                        $res_transport_mode = $Zohobook_model->customInsert($ip_invoice_custom_t, 'ip_invoice_custom');
+                        if ($res_transport_mode)
+                            log_message('error', 'Data insert success DB : ip_invoice_custom ');
+                        else
+                            log_message('error', 'Data insert failed DB : ip_invoice_custom ');
+                        // purchase_order_date
+                        $ip_invoice_custom_p['invoice_id'] = $invoice_insert_id;
+                        $ip_invoice_custom_p['invoice_custom_fieldid'] = 15;
+                        $ip_invoice_custom_p['invoice_custom_fieldvalue'] = $purchase_order_date;
+                        $res_purchase_order_date = $Zohobook_model->customInsert($ip_invoice_custom_p, 'ip_invoice_custom');
+                        if ($res_purchase_order_date)
+                            log_message('error', 'Data insert success DB : ip_invoice_custom ');
+                        else
+                            log_message('error', 'Data insert failed DB : ip_invoice_custom ');
+                        // driver
+                        $ip_invoice_custom_d['invoice_id'] = $invoice_insert_id;
+                        $ip_invoice_custom_d['invoice_custom_fieldid'] = 58;
+                        $ip_invoice_custom_d['invoice_custom_fieldvalue'] = $driver;
+                        $res_driver = $Zohobook_model->customInsert($ip_invoice_custom_d, 'ip_invoice_custom');
+                        if ($res_driver)
+                            log_message('error', 'Data insert success DB : ip_invoice_custom ');
+                        else
+                            log_message('error', 'Data insert failed DB : ip_invoice_custom ');
+                        // place_of_supply
+                        $ip_invoice_custom_d['invoice_id'] = $invoice_insert_id;
+                        $ip_invoice_custom_d['invoice_custom_fieldid'] = 10;
+                        $ip_invoice_custom_d['invoice_custom_fieldvalue'] = $place_of_supply;
+                        $res_place = $Zohobook_model->customInsert($ip_invoice_custom_d, 'ip_invoice_custom');
+                        if ($res_place)
+                            log_message('error', 'Data insert success DB : ip_invoice_custom ');
+                        else
+                            log_message('error', 'Data insert failed DB : ip_invoice_custom ');
+                        //end  invoice level custom fields
+
+                        //if line items available
+                        if (isset($rs['line_items']) && count($rs['line_items']) > 0) {
+                            log_message('error', 'Processing line items' . count($rs['line_items']));
+
+                            for ($i = 0; $i < count($rs['line_items']); $i++) {            //start insert line items
+                                $sku = $rs['line_items'][$i]['sku'];
+
+
+                                $item_price = $rs['line_items'][$i]['rate'];
+                                $item_order =  $rs['line_items'][$i]['item_order'];
+                                $item_product_unit = $rs['line_items'][$i]['unit'];
+                                $item_name = $rs['line_items'][$i]['name'];
+                                $item_description = $rs['line_items'][$i]['description'];
+                                $item_quantity = $rs['line_items'][$i]['quantity'];
+                                $cgst = $rs['line_items'][$i]['line_item_taxes'][1]['tax_name'];
+                                $sgst = $rs['line_items'][$i]['line_item_taxes'][0]['tax_name'];
+                                $cgst = $cgst[4];
+                                $sgst = $sgst[4];
+                                $cgst = $cgst . '.000';
+                                $getcgsttax = $Zohobook_model->ip_tax_rates($cgst);
+                                if ($getcgsttax) {
+                                    $cgsttaxid = $getcgsttax[0]['tax_rate_id'];
+                                    log_message('error', 'Data fetch success DB : ip_tax_rates cgst' . $cgst);
+                                } else {
+                                    log_message('error', 'No data => Data fetch failed DB : ip_tax_rates ' . $cgst);
+                                    $cgst_data['tax_rate_percent'] = $cgst;
+                                    $getcgsttax = $Zohobook_model->customInsert($cgst_data, 'ip_tax_rates');
+                                    $cgsttaxid = $getcgsttax;
+                                    log_message('error', 'New Data Created : DB : ip_tax_rates , tax_rate_id : ' . $cgsttaxid);
                                 }
+
+                                $sgst = $sgst . '.000';
+                                $getsgsttax = $Zohobook_model->ip_tax_rates($sgst);
+                                if ($getsgsttax) {
+                                    $sgsttaxid = $getsgsttax[0]['tax_rate_id'];
+                                    log_message('error', 'Data fetch success DB : ip_tax_rates sgst' . $sgst);
+                                } else {
+                                    log_message('error', 'No data => Data fetch failed DB : ip_tax_rates ' . $sgst);
+                                    $sgst_data['tax_rate_percent'] = $sgst;
+                                    $getsgsttax = $Zohobook_model->customInsert($sgst_data, 'ip_tax_rates');
+                                    $sgsttaxid = $getsgsttax;
+                                    log_message('error', 'New Data Created : DB : ip_tax_rates , tax_rate_id : ' . $sgsttaxid);
+                                }
+
+                                $item_subtotal = $rs['line_items'][$i]['item_total'];
+
+
+                                $item_sgst_amt = $rs['line_items'][$i]['line_item_taxes'][0]['tax_amount'];
+                                $item_cgst_amt = $rs['line_items'][$i]['line_item_taxes'][1]['tax_amount'];
+                                $item_tax_total = ($item_sgst_amt + $item_cgst_amt);
+                                $item_total = ($item_subtotal + $item_tax_total);
+
+                                $item_discount = 0.00;
+                                $item_igst_amt = 0.00;
+                                // if($batch_no==""){ $batch_no = "";}
+
+
+                                $sku_sql = $Zohobook_model->ip_products($sku);
+                                if (!empty($sku_sql)) {
+                                    $product_id = $sku_sql[0]['product_id'];
+                                    log_message('error', 'Data fetch success DB : ip_products , product_id : ' . $product_id);
+                                } else {
+                                    log_message('error', 'No data => Data fetch failed DB : ip_products ' . $sku);
+                                    $sku_data['product_name'] = $item_name;
+                                    $sku_data['product_description'] = $item_description;
+                                    $sku_data['sku'] = $sku;
+                                    $sku_inserted_id = $Zohobook_model->customInsert($sku_data, 'ip_products');
+                                    $product_id = $sku_inserted_id;
+                                    log_message('error', '$sku_sql => Data fetch failed DB : ip_products ' . $sku_sql);
+
+                                    log_message('error', 'sku' . $sku);
+                                    log_message('error', 'New Data Created : DB : product_id , product_id : ' . $product_id);
+                                }
+
+                                //#1
+
+                                $ip_invoice_items['invoice_id'] = $invoice_insert_id;
+                                $ip_invoice_items['item_product_id'] = $product_id;
+                                $ip_invoice_items['item_date_added'] = $invoice_date;
+                                $ip_invoice_items['item_name'] = $item_name;
+                                $ip_invoice_items['item_description'] = $item_description;
+                                $ip_invoice_items['item_quantity'] = $item_quantity;
+                                $ip_invoice_items['item_price'] = $item_price;
+                                $ip_invoice_items['item_order'] = $item_order;
+                                $ip_invoice_items['item_product_unit'] = $item_product_unit;
+                                $ip_invoice_items['Sgst_item_tax_rate_id'] = $sgsttaxid;
+                                $ip_invoice_items['Cgst_item_tax_rate_id'] = $cgsttaxid;
+                                $item_insert_id = $Zohobook_model->customInsert($ip_invoice_items, 'ip_invoice_items');
+                                if ($item_insert_id)
+                                    log_message('error', 'Data insert success DB : ip_invoice_items => Sgst_item_tax_rate_id :' . $sgsttaxid);
                                 else
-                                {
-                                    log_message('error', 'No data => Data fetch failed DB : ip_clients '.$gst_no);
-                                    $gst_no_data['client_tax_code'] = $gst_no;
-                                    $gst_inserted_id = $Zohobook_model->customInsert($gst_no_data,'ip_clients');
-                                    $client_id = $gst_inserted_id;
-                                    log_message('error', 'New Data Created : DB : ip_clients , client_id : '.$client_id);
-                                }
+                                    log_message('error', 'Data insert failed DB : ip_invoice_items => Sgst_item_tax_rate_id :' . $sgsttaxid);
 
-
-                                $characters = '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-                                $charactersLength = strlen($characters);
-                                $randomString = '';
-                                for ($i = 0; $i < 16; $i++) { $randomString .= $characters[rand(0, $charactersLength - 1)]; }
-                                $url_key = $randomString;
-    
-                                    $ip_invoices['user_id'] = 1;
-                                    $ip_invoices['client_id'] = $client_id;
-                                    $ip_invoices['invoice_group_id'] = 6;
-                                    $ip_invoices['invoice_status_id'] = ($status == 'draft' ? 1 : (($status == 'sent' || $status == 'overdue') ? 2 : 5));
-                                    $ip_invoices['invoice_date_created'] = $invoice_date;
-                                    $ip_invoices['invoice_time_created'] = $invoice_time;
-                                    $ip_invoices['invoice_date_due'] = $due_date;
-                                    $ip_invoices['invoice_number'] = $invoice_number;
-                                    $ip_invoices['invoice_url_key'] = $url_key;
-                                    $ip_invoices['receivedstatus'] = 'ST066';
-                                    $ip_invoices['credit_status'] = 0;
-                                    $ip_invoices['status'] = $status;
-                                    $ip_invoices['e_invoice_number'] = $einvoice_number;
-                                    $ip_invoices['invoice_url'] = $invoice_url;
-                                $invoice_insert_id = $Zohobook_model->customInsert($ip_invoices,'ip_invoices');
-                                if($invoice_insert_id)
-                                {
-                                    log_message('error', 'Data insert success DB : ip_invoices client id :'. $client_id);
-                                    $insert_count = $insert_count + 1;
-                                    //start invoice level custom fields
-
-                                    //custom fields insert
-
-                                        $batch_no = isset($rs['custom_fields'][5]['value']) ? $rs['custom_fields'][5]['value'] : "";
-                                            // $batch_no = "";
-                                        $vehicle_number = isset($rs['custom_field_hash']['cf_vehicle_number']) ? $rs['custom_field_hash']['cf_vehicle_number']: '';
-                                        $transport_mode =isset($rs['custom_field_hash']['cf_transport_mode']) ? $rs['custom_field_hash']['cf_transport_mode'] : '';
-                                        $purchase_order_date = isset($rs['custom_field_hash']['cf_purchase_order_date'])?$rs['custom_field_hash']['cf_purchase_order_date']:'';
-                                        $driver = isset($rs['custom_field_hash']['cf_driver']) ? $rs['custom_field_hash']['cf_driver'] : '';
-                                        $place_of_supply = isset($rs['custom_field_hash']['cf_place_of_supply']) ? $rs['custom_field_hash']['cf_place_of_supply']:'';
-                                // batch_no
-                                    $ip_invoice_custom_b['invoice_id'] = $invoice_insert_id;
-                                    $ip_invoice_custom_b['invoice_custom_fieldid'] = 62;
-                                    $ip_invoice_custom_b['invoice_custom_fieldvalue'] = $batch_no;
-                                    $result_invoice_custom_insert = $Zohobook_model->customInsert($ip_invoice_custom_b,'ip_invoice_custom');
-                                    if($result_invoice_custom_insert)
-                                        log_message('error', 'Data insert success DB : ip_invoice_custom ');
-                                    else
-                                        log_message('error', 'Data insert failed DB : ip_invoice_custom ');
-                                // vehicle_number
-                                    $ip_invoice_custom_v['invoice_id'] = $invoice_insert_id;
-                                    $ip_invoice_custom_v['invoice_custom_fieldid'] = 8;
-                                    $ip_invoice_custom_v['invoice_custom_fieldvalue'] = $vehicle_number;
-                                    $res_vehicle = $Zohobook_model->customInsert($ip_invoice_custom_v,'ip_invoice_custom');
-                                    if($res_vehicle)
-                                        log_message('error', 'Data insert success DB : ip_invoice_custom ');
-                                    else
-                                        log_message('error', 'Data insert failed DB : ip_invoice_custom ');
-                                // transport_mode
-                                    $ip_invoice_custom_t['invoice_id'] = $invoice_insert_id;
-                                    $ip_invoice_custom_t['invoice_custom_fieldid'] = 7;
-                                    $ip_invoice_custom_t['invoice_custom_fieldvalue'] = $transport_mode;
-                                    $res_transport_mode = $Zohobook_model->customInsert($ip_invoice_custom_t,'ip_invoice_custom');
-                                    if($res_transport_mode)
-                                        log_message('error', 'Data insert success DB : ip_invoice_custom ');
-                                    else
-                                        log_message('error', 'Data insert failed DB : ip_invoice_custom ');
-                                // purchase_order_date
-                                    $ip_invoice_custom_p['invoice_id'] = $invoice_insert_id;
-                                    $ip_invoice_custom_p['invoice_custom_fieldid'] = 15;
-                                    $ip_invoice_custom_p['invoice_custom_fieldvalue'] = $purchase_order_date;
-                                    $res_purchase_order_date =$Zohobook_model->customInsert($ip_invoice_custom_p,'ip_invoice_custom');
-                                    if($res_purchase_order_date)
-                                        log_message('error', 'Data insert success DB : ip_invoice_custom ');
-                                    else
-                                        log_message('error', 'Data insert failed DB : ip_invoice_custom ');
-                                // driver
-                                    $ip_invoice_custom_d['invoice_id'] = $invoice_insert_id;
-                                    $ip_invoice_custom_d['invoice_custom_fieldid'] = 58;
-                                    $ip_invoice_custom_d['invoice_custom_fieldvalue'] = $driver;
-                                    $res_driver = $Zohobook_model->customInsert($ip_invoice_custom_d,'ip_invoice_custom');
-                                    if($res_driver)
-                                        log_message('error', 'Data insert success DB : ip_invoice_custom ');
-                                    else
-                                        log_message('error', 'Data insert failed DB : ip_invoice_custom ');
-                                // place_of_supply
-                                    $ip_invoice_custom_d['invoice_id'] = $invoice_insert_id;
-                                    $ip_invoice_custom_d['invoice_custom_fieldid'] = 10;
-                                    $ip_invoice_custom_d['invoice_custom_fieldvalue'] = $place_of_supply;
-                                    $res_place = $Zohobook_model->customInsert($ip_invoice_custom_d,'ip_invoice_custom');
-                                    if($res_place)
-                                        log_message('error', 'Data insert success DB : ip_invoice_custom ');
-                                    else
-                                        log_message('error', 'Data insert failed DB : ip_invoice_custom ');
-                                    //end  invoice level custom fields
-
-                                    //if line items available
-                                    if(isset($rs['line_items']) && count($rs['line_items']) > 0)
-                                    {
-                                        log_message('error', 'Processing line items'.count($rs['line_items']));
-
-                                        for($i = 0; $i< count($rs['line_items']);$i++)
-                                        {            //start insert line items
-                                                    $sku = $rs['line_items'][$i]['sku'];
-                                                    
-                                                    
-                                                    $item_price = $rs['line_items'][$i]['rate'];
-                                                    $item_order =  $rs['line_items'][$i]['item_order'];
-                                                    $item_product_unit = $rs['line_items'][$i]['unit'];
-                                                    $item_name = $rs['line_items'][$i]['name'];
-                                                    $item_description = $rs['line_items'][$i]['description'];
-                                                    $item_quantity = $rs['line_items'][$i]['quantity'];
-                                                    $cgst = $rs['line_items'][$i]['line_item_taxes'][1]['tax_name'];
-                                                    $sgst = $rs['line_items'][$i]['line_item_taxes'][0]['tax_name'];
-                                                    $cgst = $cgst[4];
-                                                    $sgst = $sgst[4];
-                                                    $cgst = $cgst.'.000';
-                                                    $getcgsttax = $Zohobook_model->ip_tax_rates($cgst);
-                                                    if($getcgsttax)
-                                                    {
-                                                        $cgsttaxid = $getcgsttax[0]['tax_rate_id'];
-                                                        log_message('error', 'Data fetch success DB : ip_tax_rates cgst'. $cgst);
-                                                    }
-                                                    else
-                                                    {
-                                                        log_message('error', 'No data => Data fetch failed DB : ip_tax_rates '. $cgst);
-                                                        $cgst_data['tax_rate_percent'] = $cgst;
-                                                        $getcgsttax = $Zohobook_model->customInsert($cgst_data,'ip_tax_rates');
-                                                        $cgsttaxid = $getcgsttax;
-                                                        log_message('error', 'New Data Created : DB : ip_tax_rates , tax_rate_id : '.$cgsttaxid);
-                                                    }
-                        
-                                                    $sgst = $sgst.'.000';
-                                                    $getsgsttax = $Zohobook_model->ip_tax_rates($sgst);
-                                                    if($getsgsttax)
-                                                    {
-                                                        $sgsttaxid = $getsgsttax[0]['tax_rate_id'];
-                                                        log_message('error', 'Data fetch success DB : ip_tax_rates sgst'. $sgst);
-                                                    }
-                                                    else
-                                                    {
-                                                        log_message('error', 'No data => Data fetch failed DB : ip_tax_rates '. $sgst);
-                                                        $sgst_data['tax_rate_percent'] = $sgst;
-                                                        $getsgsttax = $Zohobook_model->customInsert($sgst_data,'ip_tax_rates');
-                                                        $sgsttaxid = $getsgsttax;
-                                                        log_message('error', 'New Data Created : DB : ip_tax_rates , tax_rate_id : '.$sgsttaxid);
-                                                    }
-                        
-                                                    $item_subtotal = $rs['line_items'][$i]['item_total'];
-                                                    
-                                                    
-                                                    $item_sgst_amt = $rs['line_items'][$i]['line_item_taxes'][0]['tax_amount'];
-                                                    $item_cgst_amt = $rs['line_items'][$i]['line_item_taxes'][1]['tax_amount'];
-                                                    $item_tax_total = ($item_sgst_amt + $item_cgst_amt);
-                                                    $item_total = ($item_subtotal + $item_tax_total);
-                        
-                                                    $item_discount = 0.00;
-                                                    $item_igst_amt = 0.00;
-                                                    // if($batch_no==""){ $batch_no = "";}
-                                                    
-                        
-                                                    $sku_sql = $Zohobook_model->ip_products($sku);
-                                                    if(!empty($sku_sql))
-                                                    {
-                                                        $product_id = $sku_sql[0]['product_id'];
-                                                        log_message('error', 'Data fetch success DB : ip_products , product_id : '.$product_id);
-                                                    }
-                                                    else
-                                                    {
-                                                        log_message('error', 'No data => Data fetch failed DB : ip_products '. $sku);
-                                                        $sku_data['product_name'] = $item_name;
-                                                        $sku_data['product_description'] = $item_description;
-                                                        $sku_data['sku'] = $sku;
-                                                        $sku_inserted_id = $Zohobook_model->customInsert($sku_data,'ip_products');
-                                                        $product_id = $sku_inserted_id;
-                                                        log_message('error', '$sku_sql => Data fetch failed DB : ip_products '. $sku_sql);
-
-                                                        log_message('error', 'sku'.$sku);
-                                                        log_message('error', 'New Data Created : DB : product_id , product_id : '.$product_id);
-                                                    }
-                        
-                                                    //#1
-                        
-                                                    $ip_invoice_items['invoice_id'] = $invoice_insert_id;
-                                                    $ip_invoice_items['item_product_id'] = $product_id;
-                                                    $ip_invoice_items['item_date_added'] = $invoice_date;
-                                                    $ip_invoice_items['item_name'] = $item_name;
-                                                    $ip_invoice_items['item_description'] = $item_description;
-                                                    $ip_invoice_items['item_quantity'] = $item_quantity;
-                                                    $ip_invoice_items['item_price'] = $item_price;
-                                                    $ip_invoice_items['item_order'] = $item_order;
-                                                    $ip_invoice_items['item_product_unit'] = $item_product_unit;
-                                                    $ip_invoice_items['Sgst_item_tax_rate_id'] = $sgsttaxid;
-                                                    $ip_invoice_items['Cgst_item_tax_rate_id'] = $cgsttaxid;
-                                                    $item_insert_id = $Zohobook_model->customInsert($ip_invoice_items,'ip_invoice_items');
-                                                    if($item_insert_id)
-                                                        log_message('error', 'Data insert success DB : ip_invoice_items => Sgst_item_tax_rate_id :'. $sgsttaxid);
-                                                    else
-                                                        log_message('error', 'Data insert failed DB : ip_invoice_items => Sgst_item_tax_rate_id :'. $sgsttaxid);
-                        
-                                                    //tax amount --  ip_invoice_item_amounts - table
-                                                        $ip_invoice_item_amounts['item_id'] = $item_insert_id;
-                                                        $ip_invoice_item_amounts['item_subtotal'] = $item_subtotal;
-                                                        $ip_invoice_item_amounts['item_tax_total'] = $item_tax_total;
-                                                        $ip_invoice_item_amounts['item_total'] = $item_total;
-                                                        $ip_invoice_item_amounts['item_sgst_amt'] = $item_sgst_amt;
-                                                        $ip_invoice_item_amounts['item_cgst_amt'] = $item_cgst_amt;
-                                                        $ip_invoice_item_amounts['item_discount'] = $item_discount;
-                                                        $ip_invoice_item_amounts['item_igst_amt'] = $item_igst_amt;
-                                                    $result_tax_amount_insert = $Zohobook_model->customInsert($ip_invoice_item_amounts,'ip_invoice_item_amounts');
-                                                    if($result_tax_amount_insert)
-                                                        log_message('error', 'Data insert success DB : ip_invoice_item_amounts ');
-                                                    else
-                                                        log_message('error', 'Data insert failed DB : ip_invoice_item_amounts ');
-                                                        
-                                        }         //end line items insert    
-
-                                    }   
-                                    else
-                                    {
-                                        log_message('error', 'Line Items not found in API result');
-                                    }
-                                }
+                                //tax amount --  ip_invoice_item_amounts - table
+                                $ip_invoice_item_amounts['item_id'] = $item_insert_id;
+                                $ip_invoice_item_amounts['item_subtotal'] = $item_subtotal;
+                                $ip_invoice_item_amounts['item_tax_total'] = $item_tax_total;
+                                $ip_invoice_item_amounts['item_total'] = $item_total;
+                                $ip_invoice_item_amounts['item_sgst_amt'] = $item_sgst_amt;
+                                $ip_invoice_item_amounts['item_cgst_amt'] = $item_cgst_amt;
+                                $ip_invoice_item_amounts['item_discount'] = $item_discount;
+                                $ip_invoice_item_amounts['item_igst_amt'] = $item_igst_amt;
+                                $result_tax_amount_insert = $Zohobook_model->customInsert($ip_invoice_item_amounts, 'ip_invoice_item_amounts');
+                                if ($result_tax_amount_insert)
+                                    log_message('error', 'Data insert success DB : ip_invoice_item_amounts ');
                                 else
-                                {
-                                    log_message('error', 'Data insert failed DB : ip_invoice_items client id :'. $client_id);
-                                }
-                                
-                                
-                        }   
-                        else // update invoice status, especially for cancelled invoices
-                        {
-                            // if($status == "void" || $status == "sent" ||  $status == "overdue")
-                            // {
-                                $sql_invoice_update = array();
-                                $sql_invoice_update['invoice_status_id'] = (($status == "sent" || $status == "overdue") ? 2 : 5);
-                                // echo 'script' . $invoice_number. $status;
-                                // print_r( $sql_invoice_update);
-                                // echo '<br>';
-                                $sql_invoice_update = $Zohobook_model->sql_invoice_update($sql_invoice_update,$invoice_number,$invoice_date,'ip_invoices');
-                                if($sql_invoice_update)
-                                {
-                                    log_message('error', 'Data update success DB : ip_invoices ');
-                                }
-                                else
-                                {
-                                    log_message('error', 'Data update failed DB : ip_invoices ');
-                                }
-                                $update_count = $update_count + 1;
-                            // }
+                                    log_message('error', 'Data insert failed DB : ip_invoice_item_amounts ');
+                            }         //end line items insert    
+
+                        } else {
+                            log_message('error', 'Line Items not found in API result');
                         }
+                    } else {
+                        log_message('error', 'Data insert failed DB : ip_invoice_items client id :' . $client_id);
+                    }
+                } else // update invoice status, especially for cancelled invoices
+                {
+                    // if($status == "void" || $status == "sent" ||  $status == "overdue")
+                    // {
+                    $sql_invoice_update = array();
+                    $sql_invoice_update['invoice_status_id'] = (($status == "sent" || $status == "overdue") ? 2 : 5);
+                    // echo 'script' . $invoice_number. $status;
+                    // print_r( $sql_invoice_update);
+                    // echo '<br>';
+                    $sql_invoice_update = $Zohobook_model->sql_invoice_update($sql_invoice_update, $invoice_number, $invoice_date, 'ip_invoices');
+                    if ($sql_invoice_update) {
+                        log_message('error', 'Data update success DB : ip_invoices ');
+                    } else {
+                        log_message('error', 'Data update failed DB : ip_invoices ');
+                    }
+                    $update_count = $update_count + 1;
+                    // }
+                }
                 // echo 'new invoice inserted count- ' . $insert_count . '/' . 'status updated count - ' . $update_count;
 
-                }$response = [
-                    'status' => true,
-                    'message' => "Successfully data inserted. Total inserted: " . $insert_count . ", Total Updated: " . $update_count
-                ];
-                return json_encode($response);
-    
-                // curl_close($ch);
+            }
+            $response = [
+                'status' => true,
+                'message' => "Successfully data inserted. Total inserted: " . $insert_count . ", Total Updated: " . $update_count
+            ];
+            return json_encode($response);
+
+            // curl_close($ch);
             // }
-        }
-        catch (\Exception $e) {
+        } catch (\Exception $e) {
             $data['err'] = $e->getMessage();
             // $db = \Config\Database::connect();
             // $data['last_query'] = $db->getLastQuery();;
-            $Zohobook_model->customInsert($data,'zohobook_api_err');
+            $Zohobook_model->customInsert($data, 'zohobook_api_err');
             log_message('error', "Data insertion failed : " . $e->getMessage());
-    
+
             return json_encode("Data insertion failed : " . $e->getMessage());
         }
     }
     // END zoho API 
 
-    function fetchEmployeeDetails() {
+    function fetchEmployeeDetails()
+    {
         $EmpID = $this->request->getPost('EmpID');
-    
+
         if (!$EmpID) {
             return $this->response->setJSON(['success' => false, 'message' => 'Employee ID not provided']);
         }
-    
+
         $userInfo = $this->user_model->findEmp($EmpID);
-    
+
         if ($userInfo) {
             return $this->response->setJSON(['success' => true, 'userInfo' => $userInfo]);
         } else {
             return $this->response->setJSON(['success' => false, 'message' => 'Employee not found']);
         }
     }
-}     
\ No newline at end of file
+}
diff --git a/app/Helpers/cias_helper.php b/app/Helpers/cias_helper.php
index c48c5d5c..f3f5b341 100755
--- a/app/Helpers/cias_helper.php
+++ b/app/Helpers/cias_helper.php
@@ -48,9 +48,9 @@ if (!function_exists('generateCopyrightNotice')) {
     {
         $current_year = date('Y');
         if ($current_year > 2024) {
-            return " Copyright &copy; 2024 - $current_year ";
+            return " &copy; 2024 - $current_year ";
         } else {
-            return " Copyright &copy; $current_year ";
+            return " &copy; $current_year ";
         }
     }
 }
diff --git a/app/Models/User_model.php b/app/Models/User_model.php
index 2cd57b27..8098fd00 100644
--- a/app/Models/User_model.php
+++ b/app/Models/User_model.php
@@ -160,7 +160,6 @@ class User_model extends Model
         $query = $builder->get();
 
         $user = $query->getResult();
-
         if (!empty($user)) {
             if (password_verify($oldPassword, $user[0]->password)) {
 
diff --git a/app/Views/addEmployeenew.php b/app/Views/addEmployeenew.php
index d0e47df9..50414640 100644
--- a/app/Views/addEmployeenew.php
+++ b/app/Views/addEmployeenew.php
@@ -493,7 +493,7 @@
                                                             class="badge">*</span>
                                                         <input id="DateofBirth" required name="DateofBirth"
                                                             onkeypress="return false;" maxlength="10"
-                                                            onchange="getAge();" class="form-control " data-provide="datepicker"  data-date-format="dd-mm-yyyy">
+                                                            onchange="getAge();" class="form-control " data-provide="datepicker" data-date-format="dd-mm-yyyy">
                                                     </div>
                                                 </div>
                                                 <div class="row">
@@ -638,7 +638,7 @@
                                                             class="badge">*</span>
                                                         <input id="dateofjoining" name="dateofjoining"
                                                             onkeypress="return false;" maxlength="10" required
-                                                            class="form-control" data-provide="datepicker"  data-date-format="dd-mm-yyyy">
+                                                            class="form-control" data-provide="datepicker" data-date-format="dd-mm-yyyy">
                                                     </div>
                                                     <div class="col-md-3"><span>Previous Years of Experience</span>
                                                         <input type="text" id="Previousexperience" name="Previousexperience"
@@ -966,7 +966,7 @@
                                 </div>
 
                                 <div class="tab-pane fade" id="fivth">
-                                    <form id="fileForm" method="post" action="#" class="form-horizontal">
+                                    <form id="fileForm" method="post" action="#" class="form-horizontal" enctype="multipart/form-data">
                                         <div class="row">
                                             <div class="col-md-1">
                                             </div>
@@ -988,7 +988,7 @@
                                                             Add
                                                         </button>
                                                     </div>
-                                                    <div id="filesContainer"  class="col-12"></div>
+                                                    <div id="filesContainer" class="col-12"></div>
                                                     <!-- </div> -->
                                                 </div>
                                             </div>
@@ -1347,7 +1347,7 @@
             e.preventDefault(); // Prevent default form submission
 
             var isValid = true;
-            var combinedFormData = '';
+            var combinedFormData = new FormData(); // Use FormData to handle files
 
             // List of form IDs you want to combine
             var formIds = ['#accountForm', '#profileForm', '#bankForm', '#proofForm', '#fileForm']; // Add all your form IDs here
@@ -1362,8 +1362,19 @@
                     return false; // Break the loop if any form is invalid
                 }
 
-                // Serialize and combine the form data
-                combinedFormData += $form.serialize() + '&'; // Append each form's serialized data
+                // Serialize and append the form data
+                $form.find(':input').each(function() {
+                    var input = $(this);
+                    if (input.attr('type') === 'file') {
+                        // If the input is a file, append it to FormData
+                        $.each(input[0].files, function(i, file) {
+                            combinedFormData.append(input.attr('name'), file);
+                        });
+                    } else {
+                        // Otherwise, append other form data
+                        combinedFormData.append(input.attr('name'), input.val());
+                    }
+                });
             });
 
             if (!isValid) {
@@ -1371,22 +1382,21 @@
                 return; // Stop the submission if validation fails
             }
 
-            // Remove the trailing '&' from the combined form data
-            combinedFormData = combinedFormData.slice(0, -1);
+            console.log('Combined Form Data:', combinedFormData); // Log the combined form data for debugging
 
-            console.log('Combined Form Data:', combinedFormData); // Log the combined form data
-
-            // Now you can send the combined data via AJAX or perform your desired action
+            // Now you can send the combined data via AJAX
             $.ajax({
                 type: 'POST',
                 url: '<?php echo base_url() ?>addNewEmployee', // Replace with your form submission URL
                 data: combinedFormData,
+                processData: false, // Don't process the data
+                contentType: false, // Don't set content type
                 success: function(response) {
                     console.log('Form submitted successfully:', response);
                     // Handle the success scenario
-                    if(response){
+                    if (response) {
                         window.location.href = '<?php echo base_url("employeeListing"); ?>';
-                    }else{
+                    } else {
                         alert('Employee details Not Update...');
                     }
                 },
@@ -1398,6 +1408,7 @@
         });
 
 
+
         // Function to navigate to the next tab
         function goToNextTab() {
             var $activeTab = $('#rootwizard').find('ul.nav li.nav-item a.active');
diff --git a/app/Views/addasset.php b/app/Views/addasset.php
index d22c5c4c..48ea12e1 100644
--- a/app/Views/addasset.php
+++ b/app/Views/addasset.php
@@ -229,7 +229,8 @@
 				dataType: 'json',
 				success: function(data) {
 					//alert(data);
-
+					console.log(data);
+					
 					var line = '';
 					$('#SelectMaterialCode').empty();
 					//alert('before');
diff --git a/app/Views/changePassword.php b/app/Views/changePassword.php
index 804d2b2f..2b8f424b 100644
--- a/app/Views/changePassword.php
+++ b/app/Views/changePassword.php
@@ -1,96 +1,96 @@
-<div class="content-wrapper">
-    <!-- Content Header (Page header) -->
-    <section class="content-header">
-      <h1>
-        Change Password
-        <small>Set new password for your account</small>
-      </h1>
-    </section>
-    <section class="content">
-        <div class="row">
-            <div class="col-md-4">
-              <!-- general form elements -->
-                <div class="box box-success">
-                    <div class="box-header">
-                        <h3 class="box-title">Enter Details</h3>
-                    </div><!-- /.box-header -->
-                    <!-- form start -->
-                    <form role="form" action="<?php echo base_url() ?>changePassword" method="post">
-                        <div class="box-body">
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class="form-group">
-                                        <label for="inputPassword1">Old Password</label>
-                                        <input type="password" class="form-control" id="inputOldPassword" placeholder="Old password" name="oldPassword" maxlength="15" required>
-                                    </div>
-                                </div>
-                            </div>
-                            <hr>
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class="form-group">
-                                        <label for="inputPassword1">New Password</label>
-                                        <input type="password" class="form-control" id="inputPassword1" placeholder="New password" name="newPassword" maxlength="15" required>
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="row">
-                                <div class="col-md-12">
-                                    <div class="form-group">
-                                        <label for="inputPassword2">Confirm New Password</label>
-                                        <input type="password" class="form-control" id="inputPassword2" placeholder="Confirm new password" name="cNewPassword" maxlength="15" required>
-                                    </div>
-                                </div>
-                            </div>
-                        </div><!-- /.box-body -->
-    
-                        <div class="box-footer">
-                            <input type="submit" class="btn btn-success" value="Submit" />
-                            <input type="reset" class="btn btn-default" value="Reset" />
-                        </div>
-                    </form>
-                </div>
-            </div>
-            <div class="col-md-4">
-                <?php
-                    helper('form');
-                    $error = session()->getFlashdata('error');
-                    if($error)
-                    {
-                ?>
-                <div class="alert alert-danger alert-dismissable">
-                    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">�</button>
-                    <?php echo session()->getFlashdata('error'); ?>                    
-                </div>
-                <?php } ?>
-                <?php  
-                    $success = session()->getFlashdata('success');
-                    if($success)
-                    {
-                ?>
-                <div class="alert alert-success alert-dismissable">
-                    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">�</button>
-                    <?php echo session()->getFlashdata('success'); ?>
-                </div>
-                <?php } ?>
-                
-                <?php  
-                    $noMatch = session()->getFlashdata('nomatch');
-                    if($noMatch)
-                    {
-                ?>
-                <div class="alert alert-warning alert-dismissable">
-                    <button type="button" class="close" data-dismiss="alert" aria-hidden="true">�</button>
-                    <?php echo session()->getFlashdata('nomatch'); ?>
-                </div>
-                <?php } ?>
-                
+<div class="content-page">
+    <div class="content">
+        <!-- Start Content-->
+        <div class="container-fluid">
+            <!-- start page title -->
+            <div>
                 <div class="row">
-                    <div class="col-md-12">
-                        <?php //echo validation_errors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true">�</button></div>'); ?>
+                    <div class="col-6">
+                        <div class="page-title-box page-title-box-alt">
+                            <h4 class="page-title"> Change Password
+                            <small>Set new password for your account</small></h4>
+                        </div>
                     </div>
                 </div>
+                <?php
+                helper('form');
+                $error = session()->getFlashdata('error');
+                if ($error) {
+                ?>
+                    <div class="alert alert-danger alert-dismissable">
+                        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">�</button>
+                        <?php echo session()->getFlashdata('error'); ?>
+                    </div>
+                <?php } ?>
+                <?php
+                $success = session()->getFlashdata('success');
+                if ($success) {
+                ?>
+                    <div class="alert alert-success alert-dismissable">
+                        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">�</button>
+                        <?php echo session()->getFlashdata('success'); ?>
+                    </div>
+                <?php } ?>
+
+                <?php
+                $noMatch = session()->getFlashdata('nomatch');
+                if ($noMatch) {
+                ?>
+                    <div class="alert alert-warning alert-dismissable">
+                        <button type="button" class="close" data-dismiss="alert" aria-hidden="true">�</button>
+                        <?php echo session()->getFlashdata('nomatch'); ?>
+                    </div>
+                <?php } ?>
+
+                <div class="row">
+                    <div class="col-12">
+                        <div class="card">
+                            <div class="card-body">
+                                <form role="form" action="<?php echo base_url() ?>changePassword" method="post">
+                                    <div class="box-body">
+                                        <div class="row">
+                                            <div class="col-md-4">
+                                                <div class="form-group">
+                                                    <label for="inputPassword1">Old Password</label>
+                                                    <input type="password" class="form-control" id="inputOldPassword" placeholder="Old password" name="oldPassword" maxlength="15" required>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <hr>
+                                        <div class="row">
+                                            <div class="col-md-4">
+                                                <div class="form-group">
+                                                    <label for="inputPassword1">New Password</label>
+                                                    <input type="password" class="form-control" id="inputPassword1" placeholder="New password" name="newPassword" maxlength="15" required>
+                                                </div>
+                                            </div>
+                                            <div class="col-md-4">
+                                                <div class="form-group">
+                                                    <label for="inputPassword2">Confirm New Password</label>
+                                                    <input type="password" class="form-control" id="inputPassword2" placeholder="Confirm new password" name="cNewPassword" maxlength="15" required>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="row">
+
+                                        </div>
+                                    </div><!-- /.box-body -->
+
+                                    <div class="box-footer">
+                                        <div class="row">
+                                            <div class="col-12 text-right">
+                                                <input type="reset" class="btn btn-default" style="background-color:red;color:white;" value="Reset" />
+                                                <input type="submit" class="btn btn-success" value="Submit" />
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                </form>
+                            </div> <!-- end card body-->
+                        </div> <!-- end card -->
+                    </div><!-- end col-->
+                </div>
             </div>
-        </div>
-    </section>
-</div>
+        </div> <!-- container -->
+    </div> <!-- content -->
+</div>
\ No newline at end of file
diff --git a/app/Views/companyview.php b/app/Views/companyview.php
index 2692f508..1a887da5 100644
--- a/app/Views/companyview.php
+++ b/app/Views/companyview.php
@@ -481,7 +481,7 @@ function ValidateUA() {
             <div class="row" style="margin-bottom: 10px;">
                 <div class="col-6">
                     <div class="page-title-box page-title-box-alt">
-                        <h4 class="page-title">Company Profile</h4>
+                        <h4 class="page-title">Business Settings</h4>
                     </div>
                 </div>
                 <div class="col-6 text-right">
@@ -498,7 +498,7 @@ function ValidateUA() {
                                         <form class="form-horizontal" role="form" id="addemployee" action="<?php echo base_url() ?>Updatecompany" method="post" role="form" enctype="multipart/form-data">
                                           <div class="box-body">
                                             <!-- Supplier Information -->
-                                            <legend style="margin-left:-10px;color: #4f7c97;;color: #4f7c97;">Company Information</legend>
+                                            <legend style="margin-left:-10px;color: #4f7c97;;color: #4f7c97;">Business Information</legend>
                                             <div class="col-md-12" style="margin-bottom: 27px;">
                                               <div class="form-row">
                                                 <div class=" col-md-3">
diff --git a/app/Views/dashboard.php b/app/Views/dashboard.php
index eb1125ca..ed16a770 100644
--- a/app/Views/dashboard.php
+++ b/app/Views/dashboard.php
@@ -625,8 +625,10 @@ $('#datepick').change(function() {
                 <!-- <section class="content-header"> -->
                     <!-- <h3>Admin Dashboard</h3>       -->
                     <div class="row">
-                      <div class="col-xs-12 col-md-4 col-md-offset-4" style="height: 75px;">
-                        <a href="javascript:void(0)" type="button" class="btn btn-success" onclick="synczohobooks()">Sync With Zoho Books</a>
+                      <div class="col-12 text-right" style="height: 75px;">
+                        <a href="javascript:void(0)" type="button" title="Sync With Zoho Books" class="btn btn-success" onclick="synczohobooks()">
+                        <i class="fas fa-sync-alt"></i>                          <!-- <img src="<?php echo base_url();?>public/new_assets/images/zoho_sync.png" alt="Sync Icon" style="width: 20px; height: 20px;"> -->
+                        </a>
                       </div>
                     </div>
                 <!-- </section> -->
diff --git a/app/Views/editEmployeenew.php b/app/Views/editEmployeenew.php
index 46dc8e0c..050a61f4 100644
--- a/app/Views/editEmployeenew.php
+++ b/app/Views/editEmployeenew.php
@@ -207,7 +207,7 @@ if (!empty($EmpDetails)) {
                                                         src="<?php echo  base_url() . $ProfilePic; ?>"
                                                         alt="your image" style="width: 139px;" /><br />
                                                     <input type='file' onchange="readURL(this);" id="photo"
-                                                        value="<?php echo $ProfilePic; ?>" name="photo" />
+                                                        value="<?php echo base_url() . $ProfilePic; ?>" name="photo" />
                                                     <label for="photo">Select profile picture<br /><small>(only .jpg or
                                                             .png)</small></label>
 
@@ -250,7 +250,7 @@ if (!empty($EmpDetails)) {
                                                         <input id="DateofBirth" required name="DateofBirth"
                                                             value="<?php echo $DOB; ?>" maxlength="10"
                                                             placeholder="Date Of Birth" onchange="getAge();"
-                                                            class="form-control" data-provide="datepicker"  data-date-format="dd-mm-yyyy">
+                                                            class="form-control" data-provide="datepicker" data-date-format="dd-mm-yyyy">
                                                     </div>
 
                                                     <div class="col-md-2 pad">
@@ -465,7 +465,7 @@ if (!empty($EmpDetails)) {
                                                             class="badge">*</span>
                                                         <input id="dateofjoining" name="dateofjoining"
                                                             value="<?php echo $DOJ; ?>" maxlength="10" required
-                                                            placeholder="Date Of Joining" class="form-control" data-provide="datepicker"  data-date-format="dd-mm-yyyy">
+                                                            placeholder="Date Of Joining" class="form-control" data-provide="datepicker" data-date-format="dd-mm-yyyy">
                                                     </div>
                                                     <div class="col-md-3">
                                                         <span>Previous Years of Experience</span>
@@ -874,13 +874,17 @@ if (!empty($EmpDetails)) {
                                             <div class="col-md-1">
                                             </div>
                                             <div class="col-md-11">
-                                                <div class="row">
+                                                <!-- <div class="row"> -->
                                                     <!-- <div class="files"> -->
-                                            
+                                                    <div class="col-md-10 text-right">
+                                                        <button type="button" class="btn btn-primary btn-sm a1" onclick="appendFilesFileds()" id="day" style="display: inline-block;">
+                                                            Add New File
+                                                        </button>
+                                                    </div>
                                                     <?php if (count($emp_data) > 0) {
                                                         foreach ($emp_data as $key => $value) { ?>
 
-                                                            <div class="col-md-12 pad ">
+                                                            <div class="row">
                                                                 <div class="col-md-4">
                                                                     <span>File Name</span>
                                                                     <input type="text" maxlength="255" class="form-control"
@@ -921,7 +925,7 @@ if (!empty($EmpDetails)) {
 
                                                     <div id="filesContainer" class="col-12"></div>
                                                     <!-- </div> -->
-                                                </div>
+                                                <!-- </div> -->
                                             </div>
                                         </div>
 
@@ -1617,55 +1621,55 @@ if (!empty($EmpDetails)) {
         });
 
         $('.submit').click(function(e) {
-            e.preventDefault(); // Prevent default form submission
-
+            e.preventDefault();
             var isValid = true;
-            var combinedFormData = '';
-
-            // List of form IDs you want to combine
+            var combinedFormData = new FormData(); 
             var formIds = ['#accountForm', '#profileForm', '#bankForm', '#proofForm', '#fileForm']; // Add all your form IDs here
-
             formIds.forEach(function(formId) {
                 var $form = $(formId);
 
-                // Validate the form
                 if (!$form[0].checkValidity()) {
                     isValid = false;
                     $form.find(':submit').click(); // Trigger the built-in HTML5 validation to show errors
                     return false; // Break the loop if any form is invalid
                 }
-
-                // Serialize and combine the form data
-                combinedFormData += $form.serialize() + '&'; // Append each form's serialized data
+                // Append the form data to FormData
+                $form.serializeArray().forEach(function(field) {
+                    combinedFormData.append(field.name, field.value);
+                });
+                // Handle file inputs separately
+                $form.find('input[type="file"]').each(function() {
+                    var input = $(this);
+                    $.each(input[0].files, function(i, file) {
+                        combinedFormData.append(input.attr('name'), file);
+                    });
+                });
             });
-
             if (!isValid) {
                 console.log('Validation failed. Please fill all required fields.');
                 return; // Stop the submission if validation fails
             }
+            console.log('Form Data Prepared:', combinedFormData); // Log for debugging
 
-            // Remove the trailing '&' from the combined form data
-            combinedFormData = combinedFormData.slice(0, -1);
-
-            console.log('Combined Form Data:', combinedFormData); // Log the combined form data
-
-            // Now you can send the combined data via AJAX or perform your desired action
+            // Send the combined data via AJAX
             $.ajax({
                 type: 'POST',
                 url: '<?php echo base_url() ?>employeedetails/UpdateEmployee', // Replace with your form submission URL
                 data: combinedFormData,
+                processData: false, // Prevent jQuery from processing the data
+                contentType: false, // Prevent jQuery from setting the content type
                 success: function(response) {
-                    console.log('Form submitted successfully:', response);
-                    // Handle the success scenario
-                    // if (response) {
-                    //     window.location.href = '<?php echo base_url("employeeListing"); ?>';
-                    // } else {
-                    //     alert('Employee details Not Update...');
-                    // }
+                    console.log(response);
+                    
+                    console.log('Form submitted successfully:', response == 'true');
+                    if (response == 'true') {
+                        window.location.href = '<?php echo base_url("employeeListing"); ?>';
+                    } else {
+                        alert('Employee details Not Update...');
+                    }
                 },
                 error: function(error) {
                     console.log('Form submission failed:', error);
-                    // Handle the error scenario
                 }
             });
         });
diff --git a/app/Views/employeeListing.php b/app/Views/employeeListing.php
index 5eb84cec..f93e2acb 100644
--- a/app/Views/employeeListing.php
+++ b/app/Views/employeeListing.php
@@ -95,7 +95,7 @@
                     </div>
                     <div class="col-6 text-right">
                         <a class="btn btn-success" href="<?php echo base_url(); ?>addemployee">Add New Employee</a>
-                        <a class="btn btn-success" href="<?php echo base_url(); ?>exportemployee">Export Employee Details <i class="fa fa-download" aira-hidden="true"></i></a>
+                        <!-- <a class="btn btn-success" href="<?php echo base_url(); ?>exportemployee">Export Employee Details <i class="fa fa-download" aira-hidden="true"></i></a> -->
                     </div>
                 </div>  
                 <div class="row">
diff --git a/app/Views/expense_list.php b/app/Views/expense_list.php
index a85da52e..c521e501 100644
--- a/app/Views/expense_list.php
+++ b/app/Views/expense_list.php
@@ -8,6 +8,7 @@
     .form-group {
         padding-bottom: 0%;
     }
+
     .Date-filter-form {
         display: flex;
         align-items: center;
@@ -43,7 +44,8 @@
     .icon-button:hover {
         color: #0056b3;
     }
-    .delete_button{
+
+    .delete_button {
         border: none;
         background-color: white;
         color: red;
@@ -69,7 +71,7 @@
                     <div class="col-12">
                         <div class="card">
                             <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;">
-                                <input type="hidden"  name="table" value="requisition">
+                                <input type="hidden" name="table" value="requisition">
                                 <label for="fromDate">From:</label>
                                 <input class="form-control date_range" type="date" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
 
@@ -87,11 +89,11 @@
                                             <th align="right">Created Date</th>
                                             <!-- <th align="right">Expense Id</th> -->
                                             <th align="right">Supplier Name</th>
-                                            <th align="right">GST</th>
                                             <th align="right">Cost</th>
+                                            <th align="right">GST</th>
                                             <th align="right">Total</th>
-                                            <th align="right">Status</th>
                                             <th align="right">Payment Method</th>
+                                            <th align="right">Status</th>
                                             <th>Action</th>
                                         </tr>
                                     </thead>
@@ -105,34 +107,34 @@
                                                     $fileExists = 1;
                                                     $fileUrl =  base_url('uploads/') . $record['transporter_file'];
                                                 }
-                                                    // Create download link and delete button                                                   
-                                                ?>
+                                                // Create download link and delete button                                                   
+                                        ?>
                                                 <tr>
                                                     <?php if (date('d-m-Y', strtotime($record['created_on'])) == "30-11--0001") {
                                                         $cdate =  '00-00-0000';
                                                     } else {
                                                         $cdate =  date('d-m-Y', strtotime($record['created_on']));
-                                                    } 
+                                                    }
                                                     ?>
                                                     <td><?php echo $cdate; ?></td>
                                                     <!-- <td><?php echo $record['id']; ?></td> -->
                                                     <td><?php echo $record['SupplierName']; ?></td>
-                                                    <td><?php echo $record['gst']; ?></td>
                                                     <td><?php echo $record['cost']; ?></td>
+                                                    <td><?php echo $record['gst']; ?></td>
                                                     <td><?php echo $record['total']; ?></td>
-                                                    <td><?php echo $record['status']; ?></td>
                                                     <td><?php echo $record['payment_method']; ?></td>
+                                                    <td><?php echo $record['status']; ?></td>
                                                     <td>
-                                                        <?php if($fileExists == 1){ ?>
+                                                        <?php if ($fileExists == 1) { ?>
                                                             <button title="Download FIle" class="download_button" onclick="downloadFile('<?php echo $record['id']; ?>', '<?php echo $record['transporter_file']; ?>')" style="border: none;background-color: white;color: #02a8b5;">
                                                                 <i class="fas fa-file-download"></i>
                                                             </button>
                                                             <button title="Delete File" id="deleteFile" class="delete_button" data-value="<?php echo $record['id'] ?>" data-id="<?php echo $record['id'] ?>" data-file="<?php echo $record['transporter_file'] ?>"><i class="fas fa-trash"></i></button>
-                                                            
+
                                                         <?php } ?>
-                                                        <button  title="Edit" class="edit-button" data-toggle="modal" data-target="#expenseModal" data-id="<?php echo $record['id']; ?>" style="border: none;background-color: white;color: #02a8b5;" >
-                                                                <i class="fas fa-pencil-alt"></i>
-                                                            </button>
+                                                        <button title="Edit" class="edit-button" data-toggle="modal" data-target="#expenseModal" data-id="<?php echo $record['id']; ?>" style="border: none;background-color: white;color: #02a8b5;">
+                                                            <i class="fas fa-pencil-alt"></i>
+                                                        </button>
                                                     </td>
                                                 </tr>
                                         <?php
@@ -165,7 +167,7 @@
                     <input type="hidden" name="id" id="id">
                     <div class="form-group row">
                         <div class="col-md-5">
-                            <label for="transporterfile" class="col-form-label">Transporter File:</label>
+                            <label for="transporterfile" class="col-form-label">Transporter File</label>
                             <input type="file" name="transporterfile" id="transporterfile" class="form-control">
                             <input type="hidden" name="transporterfile_name" id="transporterfile_name">
                             <small id="fileHelp" class="form-text text-muted">
@@ -175,29 +177,27 @@
                         <div class="col-md-1">
                         </div>
                         <div class="col-md-5">
-                            <label for="supplierid" class="col-form-label">Supplier :</label>
+                            <label for="supplierid" class="col-form-label">Supplier </label>
                             <select name="supplierid" id="supplierid" class="form-control" required>
                             </select>
                         </div>
                     </div>
-                    
+
                     <div class="form-group row">
                         <div class="col-md-5">
-                            <label for="gst" class="col-form-label">Tax:</label>
-                            <input type="number" name="gst" id="gst" class="form-control" >
+                            <label for="cost" class="col-form-label">Cost</label>
+                            <input type="number" name="cost" id="cost" class="form-control">
                         </div>
                         <div class="col-md-1">
                         </div>
                         <div class="col-md-5">
-                            <label for="cost" class="col-form-label">Cost:</label>
-                            <input type="number" name="cost" id="cost" class="form-control">
+                            <label for="gst" class="col-form-label">Tax</label>
+                            <input type="number" name="gst" id="gst" class="form-control">
                         </div>
-                        
-                        
                     </div>
                     <div class="form-group row">
                         <div class="col-md-5">
-                            <label for="status" class="col-form-label">Status:</label>
+                            <label for="status" class="col-form-label">Status</label>
                             <select name="status" id="status_id" class="form-control" required>
                                 <option>Select Status</option>
                                 <option value="Payment Pending">Payment Pending</option>
@@ -207,21 +207,21 @@
                         <div class="col-md-1">
                         </div>
                         <div class="col-md-5">
-                            <label for="payment_method" class="col-form-label">Payment Method:</label>
+                            <label for="payment_method" class="col-form-label">Payment Method</label>
                             <select name="payment_method" id="payment_method" class="form-control" required>
-                            <option>Select Payment Method</option>
-                            <option value="Cash">Cash</option>
-                            <option value="Online">Online</option>
+                                <option>Select Payment Method</option>
+                                <option value="Cash">Cash</option>
+                                <option value="Online">Online</option>
                             </select>
                         </div>
                     </div>
                     <div class="form-group row">
                         <div class="col-md-12">
-                            <label for="remarks" class="col-form-label">Remarks:</label>
+                            <label for="remarks" class="col-form-label">Remarks</label>
                             <!-- <input type="text" name="remarks" id="remarks" class="form-control"> -->
-                            <textarea  name="remarks" id="remarks" class="form-control"></textarea>
+                            <textarea name="remarks" id="remarks" class="form-control"></textarea>
                         </div>
-                        
+
                     </div>
                 </form>
             </div>
@@ -239,256 +239,264 @@
         window.location.href = 'downloadFile/' + fileName;
     }
     $(document).ready(function() {
-    // Function to toggle payment method based on status
-    function togglePaymentMethod() {
-        var status = $('#status_id').val();
-        console.log(status);
-        
-        if (status === 'Paid') {
-            $('#payment_method').prop('disabled', false); // Enable payment method
-        } else {
-            $('#payment_method').prop('disabled', true).val(''); // Disable payment method and clear value
+        // Function to toggle payment method based on status
+        function togglePaymentMethod() {
+            var status = $('#status_id').val();
+            console.log(status);
+
+            if (status === 'Paid') {
+                $('#payment_method').prop('disabled', false); // Enable payment method
+            } else {
+                $('#payment_method').prop('disabled', true).val(''); // Disable payment method and clear value
+            }
         }
-    }
 
-    // Trigger the toggle function on page load
-    togglePaymentMethod();
-
-    // Trigger the toggle function whenever the status changes
-    $('#status_id').on('change', function() {
+        // Trigger the toggle function on page load
         togglePaymentMethod();
+
+        // Trigger the toggle function whenever the status changes
+        $('#status_id').on('change', function() {
+            togglePaymentMethod();
+        });
     });
-});
 
     $(document).ready(function() {
         $('#supplierid').select2();
-    var formActionUrl = '';
+        var formActionUrl = '';
 
-    // Event handler for file input change
-    $('#transporterfile').on('change', function() {
-        var fileName = $(this).val().split('\\').pop(); // Get the file name
-        $('#file-name-display').text(fileName); // Display the file name
-    });
-    function togglePaymentMethodEdit() {
-        var status = $('#status_id').val();
-        console.log(status);
-        
-        if (status === 'Paid') {
-            $('#payment_method').prop('disabled', false); // Enable payment method
-        } else {
-            $('#payment_method').prop('disabled', true).val(''); // Disable payment method and clear value
-        }
-    }
-    $(document).on('click', '.edit-button', function() {
-
-        $('.modal-title').html('Edit Expense');
-        var expenseId = $(this).data('id');
-        var supplier_list = [<?php echo $supplier_list; ?>];
-        $('#supplierid').empty(); // Clear the supplier dropdown
-        $('#supplierid').append('<option>Select Supplier</option>');
-        supplier_list[0].forEach(function(supplier) {
-            $('#supplierid').append('<option value="' + supplier.SupplierID + '">' + supplier.SupplierName + '</option>');
+        // Event handler for file input change
+        $('#transporterfile').on('change', function() {
+            var fileName = $(this).val().split('\\').pop(); // Get the file name
+            $('#file-name-display').text(fileName); // Display the file name
         });
-        formActionUrl = '<?php echo base_url().'editExpense' ?>'; // Set action URL for adding
 
-        $.ajax({
-            url: '<?php echo base_url().'getExpenseDetails'; ?>',
-            type: 'POST',
-            data: { id: expenseId },
-            success: function(response) {
-                var expense = JSON.parse(response);
-                $('#id').val(expense.id);
-                $('#transporterfile').val(''); // Clear the file input
-                $('#currentFileName').text(''); // Clear the file name display
-                $('#supplierid').val(expense.supplier_id).trigger('change');
-                $('#remarks').val(expense.remarks);
-                $('#cost').val(expense.cost);
-                $('#gst').val(expense.gst);
-                $('#total').val(expense.total);
-                $('#status_id').val(expense.status);
-                $('#payment_method').val(expense.payment_method);
+        function togglePaymentMethodEdit() {
+            var status = $('#status_id').val();
+            console.log(status);
 
-                // Clear any existing file link and delete button
-                $('#transporterfile').next('.download_button').remove();
-                $('#transporterfile').next('.delete_button').remove();
-
-                if (expense.transporter_file) {
-                    $('#transporterfile_name').val(expense.transporter_file); // Set the hidden input value
-                    $('#currentFileName').text(expense.transporter_file); // Display the existing file name
-
-                    // Construct the full URL to the file
-                    var fileUrl = '<?php echo base_url('uploads/'); ?>' + expense.transporter_file;
-
-                    // Create download link and delete button
-                    var fileLink = '<a class="download_button" href="' + fileUrl + '" target="_blank" download="' + expense.transporter_file + '"><i class=" fas fa-file-download"></i></a>';
-                    var deleteButton = '<button id="deleteFile" class="delete_button" data-value="' + expense.id +'" data-id="' + expense.id + '" data-file="' + expense.transporter_file + '"><i class="fas fa-trash"></i></button>';
-
-                    // Add the file link and delete button
-                    $('#transporterfile').after(fileLink + ' ' + deleteButton);
-                } else {
-                    $('#transporterfile_name').val(''); // Clear hidden input if no file
-                }
-            togglePaymentMethodEdit();
+            if (status === 'Paid') {
+                $('#payment_method').prop('disabled', false); // Enable payment method
+            } else {
+                $('#payment_method').prop('disabled', true).val(''); // Disable payment method and clear value
+            }
+        }
+        $(document).on('click', '.edit-button', function() {
+
+            $('.modal-title').html('Edit Expense');
+            var expenseId = $(this).data('id');
+            var supplier_list = [<?php echo $supplier_list; ?>];
+            $('#supplierid').empty(); // Clear the supplier dropdown
+            $('#supplierid').append('<option>Select Supplier</option>');
+            supplier_list[0].forEach(function(supplier) {
+                $('#supplierid').append('<option value="' + supplier.SupplierID + '">' + supplier.SupplierName + '</option>');
+            });
+            formActionUrl = '<?php echo base_url() . 'editExpense' ?>'; // Set action URL for adding
+
+            $.ajax({
+                url: '<?php echo base_url() . 'getExpenseDetails'; ?>',
+                type: 'POST',
+                data: {
+                    id: expenseId
+                },
+                success: function(response) {
+                    var expense = JSON.parse(response);
+                    $('#id').val(expense.id);
+                    $('#transporterfile').val(''); // Clear the file input
+                    $('#currentFileName').text(''); // Clear the file name display
+                    $('#supplierid').val(expense.supplier_id).trigger('change');
+                    $('#remarks').val(expense.remarks);
+                    $('#cost').val(expense.cost);
+                    $('#gst').val(expense.gst);
+                    $('#total').val(expense.total);
+                    $('#status_id').val(expense.status);
+                    $('#payment_method').val(expense.payment_method);
+
+                    // Clear any existing file link and delete button
+                    $('#transporterfile').next('.download_button').remove();
+                    $('#transporterfile').next('.delete_button').remove();
+
+                    if (expense.transporter_file) {
+                        $('#transporterfile_name').val(expense.transporter_file); // Set the hidden input value
+                        $('#currentFileName').text(expense.transporter_file); // Display the existing file name
+
+                        // Construct the full URL to the file
+                        var fileUrl = '<?php echo base_url('uploads/'); ?>' + expense.transporter_file;
+
+                        // Create download link and delete button
+                        var fileLink = '<a class="download_button" href="' + fileUrl + '" target="_blank" download="' + expense.transporter_file + '"><i class=" fas fa-file-download"></i></a>';
+                        var deleteButton = '<button id="deleteFile" class="delete_button" data-value="' + expense.id + '" data-id="' + expense.id + '" data-file="' + expense.transporter_file + '"><i class="fas fa-trash"></i></button>';
+
+                        // Add the file link and delete button
+                        $('#transporterfile').after(fileLink + ' ' + deleteButton);
+                    } else {
+                        $('#transporterfile_name').val(''); // Clear hidden input if no file
+                    }
+                    togglePaymentMethodEdit();
+                }
+
+            });
+        });
+
+
+        $(document).on('click', '#addExpense', function() {
+            $('.download_button').remove();
+            $('.delete_button').remove();
+            $('.modal-title').html('Add Expense');
+            $('#transporterfile').val(''); // Clear the file input
+            $('#currentFileName').text(''); // Clear the file name display
+            $('#supplierid').val('').trigger('change');
+            $('#remarks').val('');
+            $('#cost').val('');
+            $('#gst').val('');
+            $('#total').val('');
+            $('#status_id').val('');
+            $('#payment_method').val('');
+            var supplier_list = [<?php echo $supplier_list; ?>];
+            $('#supplierid').empty(); // Clear the supplier dropdown
+            $('#supplierid').append('<option>Select Supplier</option>');
+
+            supplier_list[0].forEach(function(supplier) {
+                $('#supplierid').append('<option value="' + supplier.SupplierID + '">' + supplier.SupplierName + '</option>');
+            });
+            formActionUrl = '<?php echo base_url() . 'addExpense' ?>'; // Set action URL for adding
+            togglePaymentMethodEdit();
+        });
+
+        // Handle form submission
+        $('#tempClick').on('click', function(e) {
+            e.preventDefault();
+
+            // Native HTML5 form validation
+            if ($('#expenseForm')[0].checkValidity()) {
+                var formData = new FormData($('#expenseForm')[0]); // Use FormData to handle file upload
+                console.log(formActionUrl);
+
+                $.ajax({
+                    url: formActionUrl,
+                    type: 'POST',
+                    data: formData,
+                    processData: false,
+                    contentType: false,
+                    success: function(response) {
+                        console.log(response);
+
+                        if (response) {
+                            $('#expenseModal').modal('hide');
+                            $('#expenseForm')[0].reset();
+                            $('#file-name-display').text(''); // Clear the file name display
+                            window.location.reload();
+                        } else {
+                            console.log(response);
+                        }
+                    },
+                    error: function(xhr, status, error) {
+                        alert('An error occurred: ' + error);
+                    }
+                });
+            } else {
+                // If form is invalid, show native validation messages
+                $('#expenseForm')[0].reportValidity();
+            }
+        });
+
+
+        // DataTable initialization and date range filter logic (unchanged)
+        var table = $('#expense_list_table').DataTable({
+            dom: 'Blfrtip',
+            buttons: [
+                'copy', 'csv', 'excel', 'pdf', 'print'
+            ],
+            pageLength: 10,
+            lengthMenu: [
+                [10, 20, 30, 50, -1],
+                [10, 20, 30, 50, "All"]
+            ],
+            responsive: true,
+            order: [
+                [0, 'desc']
+            ],
+            language: {
+                paginate: {
+                    next: '<i class="fas fa-angle-right"></i>',
+                    previous: '<i class="fas fa-angle-left"></i>'
+                }
+            }
+        });
+
+        $.fn.dataTable.ext.search.push(
+            function(settings, data, dataIndex) {
+                var fromDate = $('#fromDate').val();
+                var toDate = $('#toDate').val();
+
+                if (!fromDate || !toDate) {
+                    return true; // If no dates selected, don't filter
+                }
+
+                var dateStr = data[0];
+                var dateParts = dateStr.split("-");
+                var date = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]);
+
+                var startDate = new Date(fromDate);
+                var endDate = new Date(toDate);
+
+                startDate.setDate(startDate.getDate() - 1);
+                endDate.setHours(23, 59, 59, 999);
+
+                return date >= startDate && date <= endDate;
+            }
+        );
+
+        $("#DateRangeFilter").submit(function(e) {
+            e.preventDefault();
+            table.draw();
+        });
+
+        $("#resetButton").click(function() {
+            $("#fromDate").val('');
+            $("#toDate").val('');
+            table.draw();
+        });
+
+        document.getElementById('fromDate').addEventListener('change', function() {
+            var fromDate = this.value;
+            var toDateInput = document.getElementById('toDate');
+            toDateInput.min = fromDate;
+            if (toDateInput.value < fromDate) {
+                toDateInput.value = fromDate;
             }
-            
         });
     });
 
-
-    $(document).on('click', '#addExpense', function () {
-        $('.download_button').remove();
-        $('.delete_button').remove();
-        $('.modal-title').html('Add Expense');
-        $('#transporterfile').val(''); // Clear the file input
-        $('#currentFileName').text(''); // Clear the file name display
-        $('#supplierid').val('').trigger('change');
-        $('#remarks').val('');
-        $('#cost').val('');
-        $('#gst').val('');
-        $('#total').val('');
-        $('#status_id').val('');
-        $('#payment_method').val('');
-        var supplier_list = [<?php echo $supplier_list; ?>];
-        $('#supplierid').empty(); // Clear the supplier dropdown
-        $('#supplierid').append('<option>Select Supplier</option>');
-
-        supplier_list[0].forEach(function(supplier) {
-            $('#supplierid').append('<option value="' + supplier.SupplierID + '">' + supplier.SupplierName + '</option>');
-        });
-        formActionUrl = '<?php echo base_url().'addExpense' ?>'; // Set action URL for adding
-        togglePaymentMethodEdit();
-    });
-
-    // Handle form submission
-    $('#tempClick').on('click', function(e) {
-    e.preventDefault();
-
-    // Native HTML5 form validation
-    if ($('#expenseForm')[0].checkValidity()) {
-        var formData = new FormData($('#expenseForm')[0]); // Use FormData to handle file upload
-        console.log(formActionUrl);
+    $(document).on('click', '#deleteFile', function() {
+        var fileName = $(this).data('file');
+        var expenseId = $(this).data('value');
 
         $.ajax({
-            url: formActionUrl,
+            url: '<?php echo base_url('deleteFile'); ?>',
             type: 'POST',
-            data: formData,
-            processData: false,
-            contentType: false,
+            data: {
+                file_name: fileName,
+                expense_id: expenseId
+            },
             success: function(response) {
                 console.log(response);
 
-                if (response) {
-                    $('#expenseModal').modal('hide');
-                    $('#expenseForm')[0].reset();
-                    $('#file-name-display').text(''); // Clear the file name display
-                    window.location.reload();
+                var result = JSON.parse(response);
+                if (result.success) {
+                    alert('File deleted successfully.');
+                    $('#currentFileName').text('');
+                    $('#transporterfile_name').val('');
+                    $('#deleteFile').remove(); // Remove the delete button
+                    $('#transporterfile').next('a').remove(); // Remove the download link
                 } else {
-                    console.log(response);
+                    alert('Failed to delete the file: ' + result.message);
                 }
             },
-            error: function(xhr, status, error) {
-                alert('An error occurred: ' + error);
+            error: function() {
+                alert('Error deleting the file.');
             }
         });
-    } else {
-        // If form is invalid, show native validation messages
-        $('#expenseForm')[0].reportValidity();
-    }
-});
-
-
-    // DataTable initialization and date range filter logic (unchanged)
-    var table = $('#expense_list_table').DataTable({
-        dom: 'Blfrtip',
-        buttons: [
-            'copy', 'csv', 'excel', 'pdf', 'print'
-        ],
-        pageLength: 10,
-        lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ],
-        responsive: true,
-        order: [[0, 'desc']],
-        language: {
-            paginate: {
-                next: '<i class="fas fa-angle-right"></i>',
-                previous: '<i class="fas fa-angle-left"></i>'
-            }
-        }
     });
-
-    $.fn.dataTable.ext.search.push(
-        function(settings, data, dataIndex) {
-            var fromDate = $('#fromDate').val();
-            var toDate = $('#toDate').val();
-            
-            if (!fromDate || !toDate) {
-                return true; // If no dates selected, don't filter
-            }
-            
-            var dateStr = data[0];
-            var dateParts = dateStr.split("-");
-            var date = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]);
-            
-            var startDate = new Date(fromDate);
-            var endDate = new Date(toDate);
-            
-            startDate.setDate(startDate.getDate() - 1);
-            endDate.setHours(23, 59, 59, 999);
-
-            return date >= startDate && date <= endDate;
-        }
-    );
-
-    $("#DateRangeFilter").submit(function(e) {
-        e.preventDefault();
-        table.draw();
-    });
-
-    $("#resetButton").click(function() {
-        $("#fromDate").val('');
-        $("#toDate").val('');
-        table.draw();
-    });
-
-    document.getElementById('fromDate').addEventListener('change', function() {
-        var fromDate = this.value;
-        var toDateInput = document.getElementById('toDate');
-        toDateInput.min = fromDate;
-        if (toDateInput.value < fromDate) {
-            toDateInput.value = fromDate;
-        }
-    });
-});
-
-$(document).on('click', '#deleteFile', function() {
-    var fileName = $(this).data('file');
-    var expenseId = $(this).data('value'); 
-
-    $.ajax({
-        url: '<?php echo base_url('deleteFile'); ?>',
-        type: 'POST',
-        data: { file_name: fileName, expense_id: expenseId },
-        success: function(response) {
-            console.log(response);
-            
-            var result = JSON.parse(response);
-            if (result.success) {
-                alert('File deleted successfully.');
-                $('#currentFileName').text('');
-                $('#transporterfile_name').val('');
-                $('#deleteFile').remove(); // Remove the delete button
-                $('#transporterfile').next('a').remove(); // Remove the download link
-            } else {
-                alert('Failed to delete the file: ' + result.message);
-            }
-        },
-        error: function() {
-            alert('Error deleting the file.');
-        }
-    });
-});
-
-
-
 </script>
 
 
@@ -497,4 +505,4 @@ $(document).on('click', '#deleteFile', function() {
         var fileName = this.files[0].name;
         document.getElementById('currentFileName').textContent = fileName;
     });
-</script>
+</script>
\ No newline at end of file
diff --git a/app/Views/includes/new_footer.php b/app/Views/includes/new_footer.php
index f4f5c02e..15db7a00 100644
--- a/app/Views/includes/new_footer.php
+++ b/app/Views/includes/new_footer.php
@@ -82,6 +82,36 @@
         $('#hdate').addClass('form-control');
         $('#hname').addClass('form-control');
     });
+
+
+    // Zoho Sync FUnction 
+
+    function synczohobooks() {
+
+        var sync = true
+        $('#loader_wrapper').css("display", "block");
+        $.ajax({
+            // $('#loadingDiv').show();
+
+            url: "<?php echo base_url() ?>user/zohobooks_api_fetch_all",
+            type: "post",
+            data: {
+                sync
+            },
+
+            success: function(data) {
+                console.log(data);
+                alert("Sync Completed");
+            },
+            failure: function(data) {
+                alert("Failed");
+            },
+            complete: function() {
+                $('#loader_wrapper').css("display", "none");
+            }
+        });
+    }
 </script>
 </body>
+
 </html>
\ No newline at end of file
diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php
index d8962bc1..8305ff9f 100644
--- a/app/Views/includes/new_header.php
+++ b/app/Views/includes/new_header.php
@@ -318,7 +318,8 @@
                             <div class="dropdown-menu dropdown-menu-right profile-dropdown ">
                                 <!-- item-->
                                 <div class="dropdown-header noti-title">
-                                    <h6 class="text-overflow m-0"><?php echo "Welcome ".$role_text." !"; ?><?php //echo $role; ?></h6>     
+                                    <h6 class="text-overflow m-0"><?php echo "Welcome ".$name." !"; ?><?php //echo $role; ?></h6>     
+                                    <!-- <h6 class="text-overflow m-0"><?php echo "Welcome ".$role_text." !"; ?><?php //echo $role; ?></h6>      -->
                                 </div>
     
                                 <!-- item-->
@@ -397,15 +398,19 @@
                         <div class="collapse navbar-collapse" id="topnav-menu-content">
                             <ul class="navbar-nav">
                                 <li class="nav-item dropdown">
-                                    <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-dashboard" role="button"
+                                      <a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>sales_dashboard" role="button"
+                                        aria-expanded="false">
+                                        <i class="ri-dashboard-line mr-1"></i> DASHBOARD
+                                    </a>
+                                    <!-- <a class="nav-link dropdown-toggle arrow-none" href="#" id="topnav-dashboard" role="button"
                                         data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                        <i class="ri-dashboard-line mr-1"></i> DASHBOARDS <div class="arrow-down"></div>
+                                        <i class="ri-dashboard-line mr-1"></i> DASHBOARD <div class="arrow-down"></div>
                                     </a>
                                     <div class="dropdown-menu" aria-labelledby="topnav-dashboard">
                                         <a href="<?php echo base_url(); ?>dashboard" class="dropdown-item">Home</a>
-                                        <!-- <a href="https://vu.venbait.in/d/d9eb820b-60aa-4fe6-9de0-531924185b77/sales-at-a-glance?orgId=2&from=1715215911333&to=1715237511333" class="dropdown-item">Sales</a> -->
+                                        <a href="https://vu.venbait.in/d/d9eb820b-60aa-4fe6-9de0-531924185b77/sales-at-a-glance?orgId=2&from=1715215911333&to=1715237511333" class="dropdown-item">Sales</a>
                                         <a href="<?php echo base_url(); ?>sales_dashboard" class="dropdown-item">Sales</a>
-                                    </div>
+                                    </div> -->
                                 </li>
                                 
                                 <li class="nav-item dropdown">
@@ -414,7 +419,8 @@
                                         <i class="ri-file-paper-2-line mr-1"></i>  SALES <div class="arrow-down"></div>
                                     </a>
                                     <div class="dropdown-menu" aria-labelledby="topnav-hr">
-                                        <a href="<?php echo base_url(); ?>sales_invoice" class="dropdown-item"><i class="ri-file-list-3-line align-middle mr-1"></i> Sales Invoice</a>                                       
+                                        <a href="<?php echo base_url(); ?>sales_invoice" class="dropdown-item"><i class="ri-file-list-3-line align-middle mr-1"></i>Invoice</a>                                       
+                                        <a href="<?php echo base_url(); ?>dashboard"  class="dropdown-item"><i class="ri-refresh-line align-middle mr-1"></i>Sync With Zoho Books</a>
                                     </div>
                                 </li>
                                 
@@ -483,8 +489,17 @@
                                                 <a href="<?php echo base_url(); ?>ViewPay" class="dropdown-item">PaySlip Generator</a>
                                                 <!-- <a href="<?php echo base_url(); ?>PaysilpListing" class="dropdown-item">Edit Payslip</a> -->
                                                 <a href="<?php echo base_url(); ?>emppayListings" class="dropdown-item">Employee Loan Details</a>
+
+                                            </div>
+                                        </div>
+                                        <div class="dropdown">
+                                            <a class="dropdown-item dropdown-toggle arrow-none" href="#" id="topnav-leave"
+                                                role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                <i class="fas fa-calendar-times align-middle mr-1"></i>  Leave <div class="arrow-down"></div>
+                                            </a>
+                                            <div class="dropdown-menu" aria-labelledby="topnav-leave">
                                                 <a href="<?php echo base_url(); ?>publicholidays" class="dropdown-item">Public Holidays</a>
-                                                <a href="<?php echo base_url(); ?>leavereports" class="dropdown-item">Leave Reports</a>
+                                                <a href="<?php echo base_url(); ?>leavereports" class="dropdown-item"> Reports</a>
 
                                             </div>
                                         </div>
@@ -508,7 +523,7 @@
                                                 <a href="<?php echo base_url(); ?>transporterListing" class="dropdown-item">Transporter Details</a>
                                                 <a href="<?php echo base_url(); ?>costListing" class="dropdown-item">Cost Details</a>
                                                 <a href="<?php echo base_url(); ?>assetListing" class="dropdown-item">Asset Details</a>
-                                                <a href="<?php echo base_url(); ?>companyview" class="dropdown-item">Company Master</a>
+                                                <a href="<?php echo base_url(); ?>companyview" class="dropdown-item">Business Settings</a>
                                                 <a href="<?php echo base_url(); ?>configlisting" class="dropdown-item">Config Details</a>
                                                 <a href="<?php echo base_url(); ?>departmentListing" class="dropdown-item">Department Details</a>
                                                 <a href="<?php echo base_url(); ?>rawmaterialListing" class="dropdown-item">Material Details</a>
diff --git a/app/Views/purchaseorder.php b/app/Views/purchaseorder.php
index 954b7d42..8263d852 100644
--- a/app/Views/purchaseorder.php
+++ b/app/Views/purchaseorder.php
@@ -1868,7 +1868,7 @@ if (!empty($INRSYMBOL)) {
 								</div>
 								<div class="form-group col-md-3" id="Deliverydtdiv">
 									<label>Delivery Date<span class="badge mandatory">*</span></label>
-									<input type="date" class="form-control num" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-autoclose="true" id="Deliverydt" name="Deliverydt" data-date-end-date="<?= date('d/m/Y'); ?>" required autocomplete="off" value="<?= date('d/m/Y'); ?>">
+									<input class="form-control num" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-autoclose="true" id="Deliverydt" name="Deliverydt" data-date-end-date="<?= date('d/m/Y'); ?>" required autocomplete="off" value="<?= date('d/m/Y'); ?>">
 
 									<!-- <div>
 										<?php
@@ -1898,7 +1898,7 @@ if (!empty($INRSYMBOL)) {
 							<div class="form-row">
 								<div class="form-group col-md-3">
 									<label>Purchase Order Date</label>
-									<input type="date" class="form-control num" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-autoclose="true" id="PODate" name="PODate" data-date-end-date="<?= date('d/m/Y'); ?>" required autocomplete="off" value="<?= date('d/m/Y'); ?>">
+									<input class="form-control num" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-autoclose="true" id="PODate" name="PODate" data-date-end-date="<?= date('d/m/Y'); ?>" required autocomplete="off" value="<?= date('d/m/Y'); ?>">
 
 									<!-- <div>
 										<?php
diff --git a/app/Views/requisitionlisting.php b/app/Views/requisitionlisting.php
index 10c0e31a..fb4c2459 100644
--- a/app/Views/requisitionlisting.php
+++ b/app/Views/requisitionlisting.php
@@ -86,7 +86,7 @@ span.highlight {
                 <div class="row">
                     <div class="col-12">
                         <div class="page-title-box page-title-box-alt">
-                            <h4 class="page-title">Requisition Listing</h4>
+                            <h4 class="page-title">Requisition List</h4>
                             <?php if($DraftCount == 0) { ?>
                                     <a class="btn btn-success" href="<?php echo base_url(); ?>RequisitionForm">Raise New Requisition</a>
                                     <?php } ?>
diff --git a/app/Views/sales_invoice.php b/app/Views/sales_invoice.php
index ff2573f4..0a3e5bc4 100644
--- a/app/Views/sales_invoice.php
+++ b/app/Views/sales_invoice.php
@@ -1,16 +1,16 @@
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0-beta3/css/all.min.css">
 <style>
-/* Target the first child element of #datatable-buttons_wrapper */
-#datatable-buttons_wrapper.dataTables_wrapper.dt-bootstrap4.no-footer > :nth-child(1) {
-    display: none;
-}
+    /* Target the first child element of #datatable-buttons_wrapper */
+    #datatable-buttons_wrapper.dataTables_wrapper.dt-bootstrap4.no-footer> :nth-child(1) {
+        display: none;
+    }
 
-/* Target the third child element of #datatable-buttons_wrapper */
-#datatable-buttons_wrapper.dataTables_wrapper.dt-bootstrap4.no-footer> :nth-child(3) {
-   display: none;
-}
+    /* Target the third child element of #datatable-buttons_wrapper */
+    #datatable-buttons_wrapper.dataTables_wrapper.dt-bootstrap4.no-footer> :nth-child(3) {
+        display: none;
+    }
 
-    .card_font_colorset_green{
+    .card_font_colorset_green {
         font-size: 23.7215px;
         font-weight: 500;
         line-height: 1.2;
@@ -18,7 +18,8 @@
         z-index: 1;
         color: rgb(86, 166, 75);
     }
-    .card_font_colorset_bule{
+
+    .card_font_colorset_bule {
         font-size: 23.7215px;
         font-weight: 500;
         line-height: 1.2;
@@ -26,7 +27,8 @@
         z-index: 1;
         color: rgb(31, 96, 196);
     }
-    .card_font_colorset_red{
+
+    .card_font_colorset_red {
         font-size: 23.7215px;
         font-weight: 500;
         line-height: 1.2;
@@ -34,72 +36,78 @@
         z-index: 1;
         color: rgb(173, 3, 23);
     }
-    
 </style>
 <style>
-#Requisition_filter {
-    float: inline-end;
-}
+    #Requisition_filter {
+        float: inline-end;
+    }
 
-#Requisition_wrapper .row .col-sm-4 {
-    flex-basis: 50%;
-    float: inline-end;
-}
+    #Requisition_wrapper .row .col-sm-4 {
+        flex-basis: 50%;
+        float: inline-end;
+    }
 
-#Requisition_paginate .pagination {
-    flex-basis: 50%;
-    float: inline-end;
-    margin: 0 0 15px;
-}
+    #Requisition_paginate .pagination {
+        flex-basis: 50%;
+        float: inline-end;
+        margin: 0 0 15px;
+    }
 
-#Requisition_wrapper .row:nth-child(3),
-#Requisition_wrapper .row:nth-child(1) {
-    padding: 0 15px;
-}
+    #Requisition_wrapper .row:nth-child(3),
+    #Requisition_wrapper .row:nth-child(1) {
+        padding: 0 15px;
+    }
 
-#Requisition_info {
-    margin-top: 5px;
-}
+    #Requisition_info {
+        margin-top: 5px;
+    }
 
-.dataTables_wrapper {
-    padding-bottom: 0;
-}
+    .dataTables_wrapper {
+        padding-bottom: 0;
+    }
 
-span.highlight {
-    background-color: yellow;
-}
+    span.highlight {
+        background-color: yellow;
+    }
 </style>
 
 <style>
-        .Date-filter-form {
-            display: flex;
-            align-items: center;
-            gap: 10px; /* Adjust the gap as needed */
-        }
-        .Date-filter-form input, .Date-filter-form button {
-            padding: 5px;
-            font-size: 14px;
-        }
-        .Date-filter-form button {
-            background-color: #007bff;
-            color: white;
-            border: none;
-            cursor: pointer;
-        }
-        .Date-filter-form button:hover {
-            background-color: #0056b3;
-        }
-        .icon-button {
-            background: none;
-            border: none;
-            cursor: pointer;
-            color: #007bff;
-            font-size: 18px;
-        }
-        .icon-button:hover {
-            color: #0056b3;
-        }
-    </style>
+    .Date-filter-form {
+        display: flex;
+        align-items: center;
+        gap: 10px;
+        /* Adjust the gap as needed */
+    }
+
+    .Date-filter-form input,
+    .Date-filter-form button {
+        padding: 5px;
+        font-size: 14px;
+    }
+
+    .Date-filter-form button {
+        background-color: #007bff;
+        color: white;
+        border: none;
+        cursor: pointer;
+    }
+
+    .Date-filter-form button:hover {
+        background-color: #0056b3;
+    }
+
+    .icon-button {
+        background: none;
+        border: none;
+        cursor: pointer;
+        color: #007bff;
+        font-size: 18px;
+    }
+
+    .icon-button:hover {
+        color: #0056b3;
+    }
+</style>
 <div class="content-page">
     <div class="content">
         <!-- Start Content-->
@@ -109,80 +117,82 @@ span.highlight {
                 <div class="row">
                     <div class="col-12">
                         <div class="page-title-box page-title-box-alt">
-                            <h4 class="page-title">Invoices Table</h4>
+                            <h4 class="page-title">Invoices List</h4>
                         </div>
                     </div>
-                </div>  
+                </div>
                 <div class="row">
                     <div class="col-12">
                         <div class="card">
                             <form class="Date-filter-form" id="DateRangeFilter" style="margin-top: 14px;margin-bottom: -11px;margin-left: 33px;">
-                                    <input type="hidden"  name="table" value="requisition">
-                                    <label for="fromDate">From:</label>
-                                    <input class="form-control date_range" type="date" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
+                                <input type="hidden" name="table" value="requisition">
+                                <label for="fromDate">From:</label>
+                                <input class="form-control date_range" type="date" id="fromDate" name="fromDate" placeholder="Select From Date" autocomplete="off" required>
 
-                                    <label for="toDate">To:</label>
-                                    <input class="form-control date_range" type="date" id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required>
+                                <label for="toDate">To:</label>
+                                <input class="form-control date_range" type="date" id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required>
 
-                                    <button type="submit" class="range_search_button"  title="Search"><i class="fe-search" aria-hidden="true" class="icon-button" title="Search"></i></button>
+                                <button type="submit" class="range_search_button" title="Search"><i class="fe-search" aria-hidden="true" class="icon-button" title="Search"></i></button>
                                 <i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
                                 <div class="error" id="error"></div>
                             </form>
-                            <div class="card-body">               
+                            <div class="card-body">
                                 <table id="datatable-buttosns" class="table dt-responsive nowrap w-100">
                                     <thead>
                                         <tr>
-                                            <th >Invoice Date</th>
+                                            <th>Invoice Date</th>
                                             <th>Invoice No</th>
                                             <th>Client Name</th>
-                                            <th >Product</th>
+                                            <th>Product</th>
                                             <th>Rate</th>
                                             <th>Quantity</th>
                                             <th>Sub Total</th>
                                             <th>GST</th>
                                             <th>Total</th>
                                             <th>Status</th>
-                                            <th >E-Invoice Number</th>
-                                            <th >Action</th>
+                                            <th>E-Invoice Number</th>
+                                            <th>Action</th>
                                         </tr>
                                     </thead>
                                     <tbody>
                                         <input type="text" id="invoice_id_set" name="invoice_id_set" hidden>
-                                                    <?php if(!empty($sales_invoice)){ foreach($sales_invoice as $invoice){ 
-                               
-                                                        $subtotal = $invoice->item_price * $invoice->item_quantity;
-                                                        // Calculate CGST and SGST
-                                                        $cgst_amount = ($subtotal * $invoice->cgst) / 100;
-                                                        $sgst_amount = ($subtotal * $invoice->sgst) / 100;
-                                                        $total = $subtotal + $cgst_amount + $sgst_amount;?>
-                                                        <!-- Main invoice row -->
-                                        <tr >
-                                            <td ><?php echo date('d-m-Y', strtotime($invoice->invoice_date_created)); ?></td>
-                                            <td >
-                                                <?php if(!empty($invoice->invoice_url)){ ?>
-                                                <a href="<?php echo $invoice->invoice_url; ?>" target="_blank" class="invoice-link">
-                                                <?php } ?>
-                                                <?php echo $invoice->invoice_number; ?>
-                                                <?php if(!empty($invoice->invoice_url)){ ?>
-                                                </a>
-                                                <?php } ?>
-                                            </td>
-                                            <td ><?php echo $invoice->client_name ?></td>
-                                            <td ><?php echo $invoice->item_name ?></td>
-                                            <td ><?php echo $invoice->item_price ?></td>
-                                            <td ><?php echo number_format($invoice->item_quantity, 2 ,'.', ',' ) ?></td>
-                                            <td ><?php echo number_format($subtotal, 2, '.', ',') ?></td>
-                                            <td ><?php echo number_format($cgst_amount+$sgst_amount, 2, '.', ',') ?></td>
-                                            <td ><?php echo number_format($total, 2, '.', ',') ?></td>
-                                            <td ><?php echo $invoice->status ?></td>
-                                            <td ><?php echo $invoice->e_invoice_number; ?></td>
-                                            <td >
-                                                <a class="edit-button" style="cursor: pointer; display: inline-block;" title="Files Upload" onclick="openInvoiceModal('<?php echo $invoice->invoice_number; ?>', '<?php echo $invoice->client_name; ?>', '<?php echo $invoice->invoice_date_created; ?>', '<?php echo $invoice->invoice_id; ?>')">
-                                                    <i class="fas fa-file-upload text-muted" style="font-size: 18px; vertical-align: middle;"></i>
-                                                </a>
-                                            </td>
-                                        </tr>
-                                                    <?php } } ?>
+                                        <?php if (!empty($sales_invoice)) {
+                                            foreach ($sales_invoice as $invoice) {
+
+                                                $subtotal = $invoice->item_price * $invoice->item_quantity;
+                                                // Calculate CGST and SGST
+                                                $cgst_amount = ($subtotal * $invoice->cgst) / 100;
+                                                $sgst_amount = ($subtotal * $invoice->sgst) / 100;
+                                                $total = $subtotal + $cgst_amount + $sgst_amount; ?>
+                                                <!-- Main invoice row -->
+                                                <tr>
+                                                    <td><?php echo date('d-m-Y', strtotime($invoice->invoice_date_created)); ?></td>
+                                                    <td>
+                                                        <?php if (!empty($invoice->invoice_url)) { ?>
+                                                            <a href="<?php echo $invoice->invoice_url; ?>" target="_blank" class="invoice-link">
+                                                            <?php } ?>
+                                                            <?php echo $invoice->invoice_number; ?>
+                                                            <?php if (!empty($invoice->invoice_url)) { ?>
+                                                            </a>
+                                                        <?php } ?>
+                                                    </td>
+                                                    <td><?php echo $invoice->client_name ?></td>
+                                                    <td><?php echo $invoice->item_name ?></td>
+                                                    <td><?php echo $invoice->item_price ?></td>
+                                                    <td><?php echo number_format($invoice->item_quantity, 2, '.', ',') ?></td>
+                                                    <td><?php echo number_format($subtotal, 2, '.', ',') ?></td>
+                                                    <td><?php echo number_format($cgst_amount + $sgst_amount, 2, '.', ',') ?></td>
+                                                    <td><?php echo number_format($total, 2, '.', ',') ?></td>
+                                                    <td><?php echo $invoice->status ?></td>
+                                                    <td><?php echo $invoice->e_invoice_number; ?></td>
+                                                    <td>
+                                                        <a class="edit-button" style="cursor: pointer; display: inline-block;" title="Files Upload" onclick="openInvoiceModal('<?php echo $invoice->invoice_number; ?>', '<?php echo $invoice->client_name; ?>', '<?php echo $invoice->invoice_date_created; ?>', '<?php echo $invoice->invoice_id; ?>')">
+                                                            <i class="fas fa-file-upload text-muted" style="font-size: 18px; vertical-align: middle;"></i>
+                                                        </a>
+                                                    </td>
+                                                </tr>
+                                        <?php }
+                                        } ?>
                                     </tbody>
                                 </table>
                             </div> <!-- end card body-->
@@ -193,81 +203,305 @@ span.highlight {
         </div> <!-- container -->
     </div> <!-- content -->
 </div>
- 
+
+
+<!-- Modal Structure -->
+<div class="modal fade" id="invoiceModal" tabindex="-1" role="dialog" aria-labelledby="invoiceModalLabel" aria-hidden="true">
+    <div class="modal-dialog modal-lg" role="document">
+        <div class="modal-content">
+            <div class="modal-header" style="display:block">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+
+                <h4 class="modal-title" id="standard-modalLabel">
+                    <span id="invoice_number_display_model"></span> -
+                    <span id="date_display_model"></span>
+                </h4>
+                <span id="client_name_display_model"></span>
+                <div class="col-md-12">
+
+                </div>
+            </div>
+            <div class="modal-body" style="margin-top: 23px;">
+                <div class="col-md-4">
+                    <button type="button" class="btn btn-primary btn-sm a1" onclick="appendFilesFileds()" id="day">
+                        Add New File
+                    </button>
+                </div>
+                <div id="filesContainer">
+                    <!-- Rows will be dynamically appended here -->
+                </div>
+
+                <?php if (isset($invoice_data)) {
+                    foreach ($invoice_data as $key => $value) { ?>
+
+                        <div class="row pad ">
+                            <div class="col-md-6">
+                                <span>File Name</span>
+                                <input type="text" maxlength="255" class="form-control"
+                                    value="<?php echo $value['file_name']; ?>" readonly>
+                            </div>
+                            <div class="col-md-1" style="margin-top: 25px;">
+                                <a href="<?php echo base_url() . 'public/uploads/images/emp_files/' . $value['emp_file']; ?>"
+                                    download>
+                                    <i class="fa fa-download" aria-hidden="true"
+                                        style="font-size: 25px;"></i>
+                                </a>
+                            </div>
+                            <div class="col-md-5" style="margin-top: 23px;">
+                                <button type="button" class="btn btn-danger btn-sm"
+                                    id="<?= $value['id']; ?>"
+                                    onclick="removeContact(this)">Delete</button>
+                            </div>
+                        </div>
+
+                <?php }
+                } ?>
+            </div>
+            <div class="modal-footer">
+                <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+                <button type="button" onclick="saveAttachment()" class="btn btn-primary">Save changes</button>
+            </div>
+        </div>
+    </div>
+</div>
 
 <script>
-$(document).ready(function() {
-    // Initialize the DataTable
-    var table = $('#datatable-buttosns').DataTable({
-        dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
-        buttons: [
-            'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
-        ],
-        pageLength: 10, // Default rows per page
-        lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
-        responsive: true, // Responsive table
-        order: [[0, 'desc']], // Default ordering (column index 0, descending)
-        language: {
-            paginate: {
-                next: '<i class="fas fa-angle-right"></i>', // Next button icon
-                previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+    $(document).ready(function() {
+        // Initialize the DataTable
+        var table = $('#datatable-buttosns').DataTable({
+            dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
+            buttons: [
+                'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
+            ],
+            pageLength: 10, // Default rows per page
+            lengthMenu: [
+                [10, 20, 30, 50, -1],
+                [10, 20, 30, 50, "All"]
+            ], // Rows per page options
+            responsive: true, // Responsive table
+            order: [
+                [0, 'desc']
+            ], // Default ordering (column index 0, descending)
+            language: {
+                paginate: {
+                    next: '<i class="fas fa-angle-right"></i>', // Next button icon
+                    previous: '<i class="fas fa-angle-left"></i>' // Previous button icon
+                }
             }
-        }
-    });
+        });
 
-    // Date range filter function
-    $.fn.dataTable.ext.search.push(
-        function(settings, data, dataIndex) {
-            var fromDate = $('#fromDate').val();
-            var toDate = $('#toDate').val();
-            
-            if (!fromDate || !toDate) {
-                return true; // If no dates selected, don't filter
+        // Date range filter function
+        $.fn.dataTable.ext.search.push(
+            function(settings, data, dataIndex) {
+                var fromDate = $('#fromDate').val();
+                var toDate = $('#toDate').val();
+
+                if (!fromDate || !toDate) {
+                    return true; // If no dates selected, don't filter
+                }
+
+                var dateStr = data[0]; // Assuming the date is in the first column
+                var dateParts = dateStr.split("-");
+                var date = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]); // Convert dd-mm-yyyy to Date object
+
+                var startDate = new Date(fromDate);
+                var endDate = new Date(toDate);
+
+                // Adjust startDate to include the day before the selected fromDate
+                startDate.setDate(startDate.getDate() - 1);
+
+                // Ensure endDate includes the entire end date by setting time to the end of the day
+                endDate.setHours(23, 59, 59, 999);
+
+                // Return true if the date is within the range
+                return date >= startDate && date <= endDate;
             }
-            
-            var dateStr = data[0]; // Assuming the date is in the first column
-            var dateParts = dateStr.split("-");
-            var date = new Date(dateParts[2], dateParts[1] - 1, dateParts[0]); // Convert dd-mm-yyyy to Date object
-            
-            var startDate = new Date(fromDate);
-            var endDate = new Date(toDate);
-            
-            // Adjust startDate to include the day before the selected fromDate
-            startDate.setDate(startDate.getDate() - 1);
-            
-            // Ensure endDate includes the entire end date by setting time to the end of the day
-            endDate.setHours(23, 59, 59, 999);
+        );
 
-            // Return true if the date is within the range
-            return date >= startDate && date <= endDate;
+        // Handle form submission for the date range filter
+        $("#DateRangeFilter").submit(function(e) {
+            e.preventDefault();
+            table.draw(); // Redraw the table to apply the filter
+        });
+
+        // Reset button functionality
+        $("#resetButton").click(function() {
+            $("#fromDate").val('');
+            $("#toDate").val('');
+            table.draw(); // Redraw the table to clear the filter
+        });
+
+        // Automatically focus and open the To Date picker when From Date is selected
+        document.getElementById('fromDate').addEventListener('change', function() {
+            var fromDate = this.value;
+            var toDateInput = document.getElementById('toDate');
+
+            // Set the min attribute of the To Date input to the selected From Date
+            toDateInput.min = fromDate;
+
+            // Optionally reset the To Date input if the current value is before the new min date
+            if (toDateInput.value < fromDate) {
+                toDateInput.value = fromDate;
+            }
+        });
+
+    });
+
+    function openInvoiceModal(invoiceNumber, clientName, invoiceDateCreated, invoiceId) {
+        $('#invoice_number_display_model').html(invoiceNumber);
+        $('#date_display_model').html(invoiceDateCreated);
+        $('#client_name_display_model').html(clientName);
+        $('#invoice_id_set').val(invoiceId);
+
+        // document.getElementById('modalInvoiceNumber').innerText = invoiceNumber;
+        $('#day').show();
+        // $('#invoiceModal').modal('show');
+        // url: "<?php echo base_url() ?>servicepurchaseorder/getPODetails",
+        $.ajax({
+            url: '<?php echo base_url() ?>getInvoiceAttachment',
+            type: 'GET',
+            data: {
+                invoice_number: invoiceId
+            },
+            success: function(response) {
+                console.log(response);
+                
+                console.log(JSON.parse(response).invoiceAttachment);
+                var list = JSON.parse(response).invoiceAttachment;
+                var attachmentsHtml = '';
+
+                list.forEach(element => {
+                    console.log(element);
+                    var fileName = element.file_name;
+                    var attachmentName = element.attachment_name;
+                    attachmentsHtml += `
+                <div class="row pad">
+                    <div class="col-md-4">
+                        <span>File Name</span>
+                        <input type="text" maxlength="255" class="form-control"
+                            value="${attachmentName}" readonly>
+                    </div>
+                    <div class="col-md-1" style="margin-top: 25px;">
+                       <a href="<?php echo base_url() . 'public/uploads/images/invoice_files/' ?>${fileName}" download>
+                            <i class="fa fa-download" aria-hidden="true"
+                                style="font-size: 25px;"></i>
+                        </a>
+                    </div>
+                    <div class="col-md-5" style="margin-top: 23px;">
+                        <button type="button" class="btn btn-danger btn-sm"
+                            id="${element.invoice_attachment_id}"
+                            onclick="removeContact(this)">Delete</button>
+                    </div>
+                </div>`;
+                });
+                $('#filesContainer').html(attachmentsHtml);
+                $('#invoiceModal').modal('show');
+            },
+            error: function() {
+                // Handle any errors during the AJAX request
+                $('#filesContainer').html('<p>There was an error loading the attachments.</p>');
+                $('#invoiceModal').modal('show');
+            }
+        });
+    }
+
+    function appendFilesFileds(data) {
+        var newRowHtml = `
+         <div class="row pad">
+            <div class="col-md-4">
+                <span for="file_name">File name</span>
+                <input type="text" id="file_name" name="file_name[]" maxlength="255" class="form-control" value="${data != null && data != '' ? data.file_name : ''}">
+            </div>
+            <div class="col-md-4">
+                <span for="emp_file">File</span>
+                <input type="file" name="emp_file[]" class="form-control">
+            </div>
+            <div class="col-md-4" style="margin-top: 23px;">
+                <button type="button" class="btn btn-danger btn-sm" onclick="removeContact(this)">Remove</button>
+                <button type="button" class="btn btn-primary btn-sm a1" onclick="appendFilesFileds()">Add</button>
+            </div>
+        </div>`;
+
+        // Append the new row to the container
+        $('#filesContainer').append(newRowHtml);
+
+        // Hide all "Add" buttons except the last one
+        $('.a1').hide();
+        $('#filesContainer .pad:last .a1').show();
+    }
+
+    function removeContact(button) {
+
+        $(button).closest('.pad').remove();
+        $('#filesContainer .a1').hide();
+        $('#filesContainer .pad:last .a1').show();
+        var len = $('#filesContainer .pad:last .a1')
+        var length = len.length;
+        if (length == 0) {
+            $('#day').show()
+        } else {
+            $('#day').hide()
         }
-    );
+        console.log("-------------------");
+        console.log(button);
+        console.log($(button).val());
+        console.log($(button).attr('id'));
 
-    // Handle form submission for the date range filter
-    $("#DateRangeFilter").submit(function(e) {
-        e.preventDefault();
-        table.draw(); // Redraw the table to apply the filter
-    });
 
-    // Reset button functionality
-    $("#resetButton").click(function() {
-        $("#fromDate").val('');
-        $("#toDate").val('');
-        table.draw(); // Redraw the table to clear the filter
-    });
 
-    // Automatically focus and open the To Date picker when From Date is selected
-    document.getElementById('fromDate').addEventListener('change', function() {
-        var fromDate = this.value;
-        var toDateInput = document.getElementById('toDate');
-        
-        // Set the min attribute of the To Date input to the selected From Date
-        toDateInput.min = fromDate;
 
-        // Optionally reset the To Date input if the current value is before the new min date
-        if (toDateInput.value < fromDate) {
-            toDateInput.value = fromDate;
-        }
-    });
-});
+        $.ajax({
+            url: '<?php echo base_url() ?>deleteAttachment',
+            type: 'GET',
+            data: {
+                invoice_attachment_id: $(button).attr('id')
+            },
+            success: function(response) {
+                console.log(response);
+            },
+            error: function() {
+
+            }
+        });
+    }
+
+    function saveAttachment() {
+        var formData = new FormData();
+        var invoiceId = $('#invoice_id_set').val();
+        formData.append('invoice_id', invoiceId);
+
+        // Append files
+        $('input[name="emp_file[]"]').each(function(index, input) {
+            var files = $(input)[0].files;
+            if (files.length > 0) {
+                formData.append('emp_file[]', files[0]);
+            }
+        });
+
+        // Append other fields
+        $('input[name="file_name[]"]').each(function(index, input) {
+            formData.append('file_name[]', $(input).val());
+        });
+
+        // AJAX request using FormData
+        $.ajax({
+            url: '<?php echo base_url() ?>saveAttachment',
+            type: 'POST',
+            data: formData,
+            processData: false, // Prevent jQuery from converting the data
+            contentType: false, // Prevent jQuery from overriding the content type
+            success: function(response) {
+                console.log(response);
+                if (response.success) {
+                    $('#invoiceModal').modal('hide');
+                    // Handle success
+                } else {
+                    alert(response.message);
+                }
+            },
+            error: function() {
+                alert('An error occurred while saving the attachment.');
+            }
+        });
+    }
 </script>
\ No newline at end of file
diff --git a/public/new_assets/images/Print Preview.pdf b/public/new_assets/images/Print Preview.pdf
new file mode 100644
index 00000000..f90a5561
Binary files /dev/null and b/public/new_assets/images/Print Preview.pdf differ
diff --git a/public/new_assets/images/zoho_sync.png b/public/new_assets/images/zoho_sync.png
new file mode 100644
index 00000000..074522e5
Binary files /dev/null and b/public/new_assets/images/zoho_sync.png differ