CHANGE_MASTER_ISSUE_CLEAR_EXPENCE_CREATE_VIEW_CHANGE

app/Config/Routes.php

@@ -16,6 +16,7 @@ $routes->add('loginMe', 'Login::loginMe');
 $routes->get('logout', 'User::logout');
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'loadChangePass', 'User::loadChangePass');
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'changePassword', 'User::changePassword');
+$routes->match(['GET', 'POST', 'PUT', 'DELETE'], 'userChangePassword', 'User::userChangePassword');
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'pageNotFound', 'User::pageNotFound');
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'checkEmailExists', 'User::checkEmailExists');
 $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'forgotPassword', 'Login::forgotPassword');

app/Controllers/Configurationctrl.php

@@ -61,6 +61,8 @@ class Configurationctrl extends BaseController
 
 	function saveconfig()
 	{
+		// echo "<pre>";
+		// dd($this->request->getPost());
 		$ConfigName = $this->request->getPost('configurationname');
 		$Rowcount =  $this->request->getPost('txtRowCount');
 		$Comments = $this->request->getPost('Comments');
@@ -90,14 +92,15 @@ class Configurationctrl extends BaseController
 		$data['child'] = $this->configmodel->GetConfigCenterDetails($ConfigID);
 		
 		$this->global['pageTitle'] = 'Edit Config';
-		
+		// echo "<pre>";
+		// print_r($data);die;
 		$this->loadViews("editconfig", $this->global, $data, NULL);
 	
 	}
 
 	function updateconfig()
 	{
-		
+		// dd($this->request->getPost());
 		$ConfigId = $this->request->getPost('ConfigId');
 		$ConfigName = $this->request->getPost('ConfigName');
 		$Comments = $this->request->getPost('Remarks');

app/Controllers/Expense.php

@@ -46,11 +46,12 @@ class Expense extends BaseController
             'transporter_file' => $fileName,
             'supplier_id' => $this->request->getPost('supplierid'),
             'remarks' => $this->request->getPost('remarks'),
+            'item_description' => $this->request->getPost('item_description'),
             'cost' => $this->request->getPost('cost'),
-            'gst' => $this->request->getPost('gst'),
+            'cgst' => $this->request->getPost('cgst'),
-            'total' => (int)$this->request->getPost('gst') + (int)$this->request->getPost('cost'),
+            'sgst' => $this->request->getPost('sgst'),
-            'status' => $status,
+            'igst' => $this->request->getPost('igst'),
-            'payment_method' => $paymentMethod
+            'total' => $this->request->getPost('total'),
         ];
 
         $insert_id = $this->expense_model->insertExpense($data);
@@ -92,16 +93,16 @@ class Expense extends BaseController
         $data = [
             'supplier_id' => $this->request->getPost('supplierid'),
             'remarks' => $this->request->getPost('remarks'),
+            'item_description' => $this->request->getPost('item_description'),
             'cost' => $this->request->getPost('cost'),
-            'gst' => $this->request->getPost('gst'),
+            'cgst' => $this->request->getPost('cgst'),
-            'total' => (int)$this->request->getPost('gst') + (int)$this->request->getPost('cost'),
+            'sgst' => $this->request->getPost('sgst'),
-            'status' => $status,
+            'igst' => $this->request->getPost('igst'),
-            'payment_method' => $paymentMethod
+            'total' => $this->request->getPost('total'),
         ];
         if(!empty($fileName)){
             $data['transporter_file'] = $fileName;
         }
-            $data['payment_method'] = $this->request->getPost('payment_method');
        
 
         if ($id) {

app/Controllers/Purchaseorder.php

@@ -345,11 +345,12 @@ class Purchaseorder extends BaseController
 
     $data['TotalAmountInWords'] = $this->convertNumber($totalAmt);
     $data['RequistionDetails'] = $this->purchaseorder_model->GetPdfRequistionDetails($PONO);
-// echo '<pre>';
+    // echo '<pre>';
-// print_r($data);
+    // print_r($data);
-// echo '</pre>';
+    // echo '</pre>';
-// die;
+    // die;
-    $mpdf = new \Mpdf\Mpdf(['mode' => 'utf-8',
+    $mpdf = new \Mpdf\Mpdf([
+      'mode' => 'utf-8',
       'format' => 'A4',
       'default_font' => 'sans-serif',
       'margin_header' => 0,
@@ -357,7 +358,8 @@ class Purchaseorder extends BaseController
       'margin_right' => 14,
       'margin_left' => 5,
       'margin_footer' => -30,
-    'orientation' => 'P']);
+      'orientation' => 'P'
+    ]);
     // Set PDF properties 
     $mpdf->SetTitle('Invoice');
     $mpdf->SetAuthor($data['CompanyDetails'][0]->CompanyName);
@@ -375,7 +377,7 @@ class Purchaseorder extends BaseController
     // Set auto margins
     $mpdf->setAutoTopMargin = 'stretch';
     $mpdf->setAutoBottomMargin = 'stretch';
-$mpdf->use_kwt = true;
+    $mpdf->use_kwt = true;
     // Set HTML header
     // $HtmlHeading = view('includes/pdfheader', $data);
     // $mpdf->SetHTMLHeader($HtmlHeading);
@@ -394,7 +396,7 @@ $mpdf->use_kwt = true;
     // Output PDF
     $mpdf->Output('POReport' . $PONO . '.pdf', 'D');
   }
-  public function poprint2($PONO,$ReqType)
+  public function poprint2($PONO, $ReqType)
   {
 
     // Load all views as normal
@@ -432,7 +434,7 @@ $mpdf->use_kwt = true;
 
 
 
-// print_r($data['POItem']);die;
+    // print_r($data['POItem']);die;
     $CapitalRange = 1;
 
 
@@ -450,8 +452,6 @@ $mpdf->use_kwt = true;
         $TotalOrderValue = $POI->TotalOrderValue;
         $PoStatus = $POI->Status;
         $Requester = isset($POI->Requestedby) ? $POI->Requestedby : "";
-  
-  
       }
     }
 
@@ -468,7 +468,8 @@ $mpdf->use_kwt = true;
 
 
 
-    $mpdf = new \Mpdf\Mpdf(['mode' => 'utf-8',
+    $mpdf = new \Mpdf\Mpdf([
+      'mode' => 'utf-8',
       'format' => 'A4',
       'default_font' => 'sans-serif',
       'margin_header' => 0,
@@ -476,7 +477,8 @@ $mpdf->use_kwt = true;
       'margin_right' => 14,
       'margin_left' => 5,
       'margin_footer' => -30,
-    'orientation' => 'P']);
+      'orientation' => 'P'
+    ]);
     // Set PDF properties 
     $mpdf->SetTitle('Invoice');
     $mpdf->SetAuthor($data['CompanyDetails'][0]->CompanyName);
@@ -511,7 +513,7 @@ $mpdf->use_kwt = true;
     // $mpdf->setFooter('' . "Page {PAGENO} of {nb}");
 
     // Output PDF
-    $mpdf->Output($ReqType.'_' . $PONO . '.pdf', 'D');
+    $mpdf->Output($ReqType . '_' . $PONO . '.pdf', 'D');
   }
 
 
@@ -620,7 +622,7 @@ $mpdf->use_kwt = true;
     if ($ReqType == SERVICE) {
 
       $data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetails($PONO);
-// print_r($data['POItem']);die;
+      // print_r($data['POItem']);die;
       $data['getdata'] = $this->purchaseorder_model->getfunction($PONO);
       //$data['billfile'] = $this->purchaseorder_model->getbillfiesr($pono);
 
@@ -1083,7 +1085,7 @@ $mpdf->use_kwt = true;
       $supplierreference = $this->request->getPost('addsupplierreference');
       $supplieroffno = $this->request->getPost('addsupplierofferno');
       $otherreference = $this->request->getPost('addotherreference');
-          $fincap = "";//$this->request->getPost('addfincap');
+      $fincap = ""; //$this->request->getPost('addfincap');
       $revenuetype = $this->request->getPost('PoTypeOptions');
       $insurancestatus = $this->request->getPost('insurance');
       $InsuranceNumber = ($insurancestatus == 1) ? $this->request->getPost('InsuranceNumber') : '';
@@ -1107,19 +1109,19 @@ $mpdf->use_kwt = true;
       if (!empty($file)) {
         if ($file->isValid() && !$file->hasMoved()) {
           $requestfilename = $file->getName();
-                $path = ROOTPATH.'public/uploads/POfiles/';
+          $path = ROOTPATH . 'public/uploads/POfiles/';
-                if(!is_dir($path)) { mkdir($path, 0777, true); }
+          if (!is_dir($path)) {
-                if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
+            mkdir($path, 0777, true);
-                  log_message('error', 'File already exists in the database'.$requestfilename);
-                  $requestfilename = "";
           }
-                else{
+          if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
+            log_message('error', 'File already exists in the database' . $requestfilename);
+            $requestfilename = "";
+          } else {
             $file->move($path, $requestfilename);
           }
-              }else{
+        } else {
           $requestfilename = "";
         }
-              
       }
 
       // Generate PO Number
@@ -1127,7 +1129,7 @@ $mpdf->use_kwt = true;
       $newPONO = generate_po_number($lastPONO);
       log_message('debug', 'newPONO returned: ' . $newPONO);
       // PO Master
-          $POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'Status' => $POStatus, 'PORange' => $Local_Interstate, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'POType' => $POType, 'CapitalRange' => $Local_Interstate, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $supplierreference, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'POSubType' => $revenuetype, 'InsuranceNumber' => $InsuranceNumber, 'IsQualityChkReqired' => $Qualitycheck, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder,'POFile'=>$requestfilename);
+      $POList = array('PONO' => $newPONO, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrderValueSummary, 'PODate' => $PODate, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'Status' => $POStatus, 'PORange' => $Local_Interstate, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'DeliveryDate' => $Deliverydt, 'CreatedDate' => $createddt, 'PaymentTerms' => $PaymentTerms, 'POType' => $POType, 'CapitalRange' => $Local_Interstate, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $supplierreference, 'Mode_Of_Shipment' => $Modeofshipment, 'Supplier_Offer_No' => $supplieroffno, 'Other_Reference' => $otherreference, 'Fincap' => $fincap, 'InsuranceStatus' => $insurancestatus, 'POSubType' => $revenuetype, 'InsuranceNumber' => $InsuranceNumber, 'IsQualityChkReqired' => $Qualitycheck, 'BudgetType' => $BudgetType, 'IsOpenOrder' => $IsOpenOrder, 'POFile' => $requestfilename);
       $POMaster = $this->purchaseorder_model->addPOMaster($POList, $POType, $revenuetype);
       $PONO = '';
       if (count($POMaster) > 0) {
@@ -1239,7 +1241,7 @@ $mpdf->use_kwt = true;
     $supplierreference = $this->request->getPost('editsupplierreference');
     $supplieroffno = $this->request->getPost('editsupplierofferno');
     $otherreference = $this->request->getPost('editotherreference');
-    $fincap = "";// $this->request->getPost('editfincap');
+    $fincap = ""; // $this->request->getPost('editfincap');
     $revenuetype = $this->request->getPost('PoTypeOptions');
     $insurancestatus = $this->request->getPost('insurancestatus');
     if ($insurancestatus == 1) {
@@ -1290,12 +1292,13 @@ $mpdf->use_kwt = true;
       if ($file && $file->isValid() && !$file->hasMoved()) {
         $requestfilename = $file->getName();
 
-                    $path = ROOTPATH.'public/uploads/POfiles/';
+        $path = ROOTPATH . 'public/uploads/POfiles/';
-                    if(!is_dir($path)) { mkdir($path, 0777, true); }
+        if (!is_dir($path)) {
-                    if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
+          mkdir($path, 0777, true);
-                      log_message('error', 'File already exists in the database'.$requestfilename);
         }
-                    else{
+        if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
+          log_message('error', 'File already exists in the database' . $requestfilename);
+        } else {
           $file->move($path, $requestfilename);
           $POList['POFile'] = $requestfilename;
         }
@@ -1438,7 +1441,6 @@ $mpdf->use_kwt = true;
       if ($SkipInsert == "False") {
 
         if (strlen((string)$POLineItemNo) == 0) {
-          
         } else {
 
           $LineItemNo = $POLineItemNo;
@@ -1449,7 +1451,6 @@ $mpdf->use_kwt = true;
         }
         $isExists = $this->purchaseorder_model->LineItemExistsinRevenueTax($LineItemNo);
         if (count($isExists) == 0) {
-          
         } else {
 
           $RevenueTaxList = array('DiscountType' => $DiscountType, 'DiscountValue' => $DiscountValue, 'AfterDiscount' => $AfterDiscount, 'PackagingType' => $PackagingType, 'PackagingValue' => $PackagingValue, 'PackagingCalulatedOn' => $PackagingOption, 'AfterPackagingValue' => $AfterPackagingValue, 'FreightType' => $FreightType, 'FreightValue' => $FreightValue, 'AfterFreightValue' => $AfterFreightValue, 'Insurance' => $InsuranceValue, 'TotalValue' => $TotalOrderValue, 'UpdateBY' => $updatedBy, 'UpdatedOn' => $updateddt, 'CGST' => $Cgst, 'AfterCGST' => $AfterCgst, 'SGST' => $Sgst, 'AfterSGST' => $AfterSgst, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'CreatedBy' => $updatedBy, 'NoOfTrip' => $NOOfTrip);
@@ -1532,7 +1533,7 @@ $mpdf->use_kwt = true;
       $mpdf->SetWatermarkText('DRAFT');
     }
 
-    $WatermarkImage = base_url()."public/assets/images/mpdf.png";
+    $WatermarkImage = base_url() . "public/assets/images/mpdf.png";
     $mpdf->SetWatermarkImage($WatermarkImage, 8, 10);
 
     $mpdf->showWatermarkImage = true;
@@ -1891,7 +1892,7 @@ $mpdf->use_kwt = true;
       $SupplierRef = $this->request->getPost('addsupplierreference');
       $SupplierOffer = $this->request->getPost('addsupplierofferno');
       $otherRef = $this->request->getPost('addotherreference');
-          $finCap = "";//$this->request->getPost('addfincap');
+      $finCap = ""; //$this->request->getPost('addfincap');
 
       $importoption = $this->request->getPost('Importoption');
       $Insurance = $this->request->getPost('Insurance');
@@ -1913,22 +1914,22 @@ $mpdf->use_kwt = true;
 
         if ($file->isValid() && !$file->hasMoved()) {
           $requestfilename = $file->getName();
-                $path = ROOTPATH.'public/uploads/POfiles/';
+          $path = ROOTPATH . 'public/uploads/POfiles/';
-                if(!is_dir($path)) { mkdir($path, 0777, true); }
+          if (!is_dir($path)) {
-                if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
+            mkdir($path, 0777, true);
-                  log_message('error', 'File already exists in the database'.$requestfilename);
-                  $requestfilename = "";
           }
-                else{
+          if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
+            log_message('error', 'File already exists in the database' . $requestfilename);
+            $requestfilename = "";
+          } else {
             $file->move($path, $requestfilename);
           }
-              }else{
+        } else {
           $requestfilename = "";
         }
-              
       }
 
-          $POList = array('PONO' => $newPONO,'SupplierID' => $SupplierID,'TotalOrderValue' => $TotalOrder,'PODate' => $PODate,'Status' => $POStatus,'PORange' => $PoRange,'ServiceDescription' => $SpcialInstruction,'CreatedBy' => $CreateBy,'DeliveryAddress' => $DeliveryAddr,'Import_DispatchDetails' => $Dispatch,'CreatedDate' => $createddt,'DeliverySchedule' => $DeliverySchedule,'DeliveryOption' => $DeliveryOption,'ExchangeRate' => $Exchangerate,'ExchangeRateCalculatedon' => $ExchangeRateCalculatedon,'CurrencyType' => $CurrencyType,'PaymentTerms' => $PaymentTerms,'POType' => $POType,'Import_PlaceofOrgin' => $Palaceoforigin,'PaymentOtherDescription' => $OtherPayment,'Mode_Of_Shipment' => $Shipmentmode,'Supplier_Reference' => $SupplierRef,'Supplier_Offer_No' => $SupplierOffer,'Other_Reference' => $otherRef,'Fincap' => $finCap,'InsuranceStatus' => $Insurance,'InsuranceNumber' => $InsuranceNumber,'POSubType' => $importoption,'IsQualityChkReqired' => $Qualitycheck,'BudgetType' => $BudgetType,'IsOpenOrder' => $IsOpenOrder);
+      $POList = array('PONO' => $newPONO, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrder, 'PODate' => $PODate, 'Status' => $POStatus, 'PORange' => $PoRange, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'Import_DispatchDetails' => $Dispatch, 'CreatedDate' => $createddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'ExchangeRate' => $Exchangerate, 'ExchangeRateCalculatedon' => $ExchangeRateCalculatedon, 'CurrencyType' => $CurrencyType, 'PaymentTerms' => $PaymentTerms, 'POType' => $POType, 'Import_PlaceofOrgin' => $Palaceoforigin, 'PaymentOtherDescription' => $OtherPayment, 'Mode_Of_Shipment' => $Shipmentmode, 'Supplier_Reference' => $SupplierRef, 'Supplier_Offer_No' => $SupplierOffer, 'Other_Reference' => $otherRef, 'Fincap' => $finCap, 'InsuranceStatus' => $Insurance, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $importoption, 'IsQualityChkReqired' => $Qualitycheck, 'BudgetType' => $BudgetType, 'IsOpenOrder' => $IsOpenOrder);
       $POList['POFile'] = $requestfilename;
       $POMaster = $this->purchaseorder_model->addPOMaster($POList, $POType, $importoption);
       $PONO = '';
@@ -1991,7 +1992,7 @@ $mpdf->use_kwt = true;
         }
 
         if ($SkipInsert == "False") {
-                  $POLineItemList = array('PONO' => $PONO,'ReqNo' => $Reqnumber,'MaterialCode' => $MaterialCode,'Quantity' => $Quantity,'Rate' => $itemRate,'Status' => $LineItemStatus,'CreatedBy' => $CreateBy,'CreatedDate' => $createddt,'CostCenterCode' => $CostCenter,'Per' => $per,'ServiceMaterialDescription' => $specialinstruction);
+          $POLineItemList = array('PONO' => $PONO, 'ReqNo' => $Reqnumber, 'MaterialCode' => $MaterialCode, 'Quantity' => $Quantity, 'Rate' => $itemRate, 'Status' => $LineItemStatus, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'CostCenterCode' => $CostCenter, 'Per' => $per, 'ServiceMaterialDescription' => $specialinstruction);
 
           $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
 
@@ -2003,7 +2004,7 @@ $mpdf->use_kwt = true;
           }
 
           if (trim((string)$POType) == IMPORT) {
-                      $ImportTaxList = array('LineItemNo' => $LineItemNo,'BasicPriceInMTon' => $BasicPriceinmton,'ProductPrice' => $Productprice,'LandingCharge' => $LandingCharge,'AfterLandingCharge' => $AfterLandingCharge,'CustomDuty' => $CustomDuty,'AfterCustomDuty' => $AfterCustomDuty,'CustomEdCess' => $CustomEd,'CustomSHCess' => $CustomSH,'CreatedBy' => $CreateBy,'CreatedDate' => $createddt,'Grossdutypayable' => $Grossdutypayable,'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG,'QuantityKG' => $QuantityKG,'AfterCustomSHCess' => $AfterCustomSH,'AfterCustomEdCess' => $AfterCustomEd,'TotalValue' => $Totalvalueitem,'FreightType' => $FreightType,'NoOfTrip' => $nooftrip,'FreightValue' => $Freightrate,'AfterFreightValue' => $Freightamount,'AssessableValue' => $AssessableValue,'SubTotal' => $Subtotal,'IGST' => $Igst,'AfterIGST' => $AfterIgst,'DutyImpact' => $Dutyimpact,'ClearingCharge' => $Clearingcharge,'NetValue' => $Nettvalue);
+            $ImportTaxList = array('LineItemNo' => $LineItemNo, 'BasicPriceInMTon' => $BasicPriceinmton, 'ProductPrice' => $Productprice, 'LandingCharge' => $LandingCharge, 'AfterLandingCharge' => $AfterLandingCharge, 'CustomDuty' => $CustomDuty, 'AfterCustomDuty' => $AfterCustomDuty, 'CustomEdCess' => $CustomEd, 'CustomSHCess' => $CustomSH, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'Grossdutypayable' => $Grossdutypayable, 'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG, 'QuantityKG' => $QuantityKG, 'AfterCustomSHCess' => $AfterCustomSH, 'AfterCustomEdCess' => $AfterCustomEd, 'TotalValue' => $Totalvalueitem, 'FreightType' => $FreightType, 'NoOfTrip' => $nooftrip, 'FreightValue' => $Freightrate, 'AfterFreightValue' => $Freightamount, 'AssessableValue' => $AssessableValue, 'SubTotal' => $Subtotal, 'IGST' => $Igst, 'AfterIGST' => $AfterIgst, 'DutyImpact' => $Dutyimpact, 'ClearingCharge' => $Clearingcharge, 'NetValue' => $Nettvalue);
             $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
             if (!$ImportList) {
               throw new \Exception('Error occurred while creating Import Tax');
@@ -2016,7 +2017,6 @@ $mpdf->use_kwt = true;
     } catch (\Exception $e) {
       log_message('error', 'Exception occurred: ' . $e->getMessage());
       echo 'An error occurred while creating the purchase order. Please try again.';
-
     }
   }
 
@@ -2102,7 +2102,7 @@ $mpdf->use_kwt = true;
     $SupplierRef = $this->request->getPost('editsupplierreference');
     $SupplierOffer = $this->request->getPost('editsupplierofferno');
     $otherRef = $this->request->getPost('editotherreference');
-    $finCap = "";//$this->request->getPost('editfincap');
+    $finCap = ""; //$this->request->getPost('editfincap');
 
 
 
@@ -2140,12 +2140,13 @@ $mpdf->use_kwt = true;
     if (!empty($file)) {
       if ($file && $file->isValid() && !$file->hasMoved()) {
         $requestfilename = $file->getName();
-                    $path = ROOTPATH.'public/uploads/POfiles/';
+        $path = ROOTPATH . 'public/uploads/POfiles/';
-                    if(!is_dir($path)) { mkdir($path, 0777, true); }
+        if (!is_dir($path)) {
-                    if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
+          mkdir($path, 0777, true);
-                      log_message('error', 'File already exists in the database'.$requestfilename);
         }
-                    else{
+        if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
+          log_message('error', 'File already exists in the database' . $requestfilename);
+        } else {
           $file->move($path, $requestfilename);
           $POList['POFile'] = $requestfilename;
         }
@@ -2443,7 +2444,7 @@ $mpdf->use_kwt = true;
     $userID =  $this->session->get('userId');
     //print_r($data['Status']);echo "CON";
     $appList = $this->purchaseorder_model->getPOList($q);
-    $filteredAppList = array_filter($appList, function($item) {
+    $filteredAppList = array_filter($appList, function ($item) {
       return $item->Status !== PO_DRAFT;
     });
     $data['AppList'] = $filteredAppList;
@@ -2478,7 +2479,7 @@ $mpdf->use_kwt = true;
   function addNewCapitalPurchaseOrder()
   {
 
-try{
+    try {
       $POdt = $this->request->getPost('PODate');
       $PODate =  get_date_time_format($POdt);
       $SupplierID = $this->request->getPost('drpSupplier');
@@ -2535,7 +2536,7 @@ try{
       $SupplierReference = $this->request->getPost('addsupplierreference');
       $SuppliersOfferNo = $this->request->getPost('addsupplierofferno');
       $OtherReferences = $this->request->getPost('addotherreference');
-    $Fincap = "";//$this->request->getPost('addfincap');
+      $Fincap = ""; //$this->request->getPost('addfincap');
       $InsuranceOptions = $this->request->getPost('insuranceStatus');
       $InsuranceNumber = $this->request->getPost('InsuranceNumber');
       $ServiceTypeOptions = $this->request->getPost('PoTypeOptions');
@@ -2575,22 +2576,22 @@ try{
 
         if ($file->isValid() && !$file->hasMoved()) {
           $requestfilename = $file->getName();
-          $path = ROOTPATH.'public/uploads/POfiles/';
+          $path = ROOTPATH . 'public/uploads/POfiles/';
-          if(!is_dir($path)) { mkdir($path, 0777, true); }
+          if (!is_dir($path)) {
-          if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
+            mkdir($path, 0777, true);
-            log_message('error', 'File already exists in the database'.$requestfilename);
-            $requestfilename = "";
           }
-          else{
+          if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
+            log_message('error', 'File already exists in the database' . $requestfilename);
+            $requestfilename = "";
+          } else {
             $file->move($path, $requestfilename);
           }
-        }else{
+        } else {
           $requestfilename = "";
         }
-        
       }
 
-    $POList = array('PONO'=>$newPONO,'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrder, 'PODate' => $PODate, 'Status' => $POStatus, 'PORange' => $PoRange, 'ExchangeRateCalculatedon' => $ExchangeRateOn, 'ExchangeRate' => $ExchangeRate, 'PaymentTerms' => $PaymentMethod, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'CreatedDate' => $createddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'CapitalRange' => $CapitalRange, 'POType' => $POType, 'CurrencyType' => $currencytypeID, 'DeliverySchedule' => $DeliverySchedule, 'Import_PlaceofOrgin' => $Palaceoforigin, 'Import_DispatchDetails' => $Dispatch, 'DeliveryDate' => $Deliverydt, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $Qualitycheck, 'BudgetType' => $BudgetType,'IsOpenOrder'=>$IsOpenOrder);
+      $POList = array('PONO' => $newPONO, 'SupplierID' => $SupplierID, 'TotalOrderValue' => $TotalOrder, 'PODate' => $PODate, 'Status' => $POStatus, 'PORange' => $PoRange, 'ExchangeRateCalculatedon' => $ExchangeRateOn, 'ExchangeRate' => $ExchangeRate, 'PaymentTerms' => $PaymentMethod, 'ServiceDescription' => $SpcialInstruction, 'CreatedBy' => $CreateBy, 'DeliveryAddress' => $DeliveryAddr, 'CreatedDate' => $createddt, 'DeliverySchedule' => $DeliverySchedule, 'DeliveryOption' => $DeliveryOption, 'CapitalRange' => $CapitalRange, 'POType' => $POType, 'CurrencyType' => $currencytypeID, 'DeliverySchedule' => $DeliverySchedule, 'Import_PlaceofOrgin' => $Palaceoforigin, 'Import_DispatchDetails' => $Dispatch, 'DeliveryDate' => $Deliverydt, 'PaymentOtherDescription' => $OtherPayment, 'Supplier_Reference' => $SupplierReference, 'Mode_Of_Shipment' => $ModeOfShipment, 'Supplier_Offer_No' => $SuppliersOfferNo, 'Other_Reference' => $OtherReferences, 'Fincap' => $Fincap, 'InsuranceStatus' => $InsuranceOptions, 'InsuranceNumber' => $InsuranceNumber, 'POSubType' => $ServiceTypeOptions, 'IsQualityChkReqired' => $Qualitycheck, 'BudgetType' => $BudgetType, 'IsOpenOrder' => $IsOpenOrder);
       $POList['POFile'] = $requestfilename;
       // $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'Import_PlaceofOrgin'=>$Palaceoforigin);
 
@@ -2740,7 +2741,6 @@ try{
       log_message('error', 'Exception occurred: ' . $e->getMessage());
       echo 'An error occurred while creating the purchase order. Please try again.';
     }
-
   }
 
   /*Edit Capital po*/
@@ -2829,7 +2829,7 @@ try{
     $SupplierReference = $this->request->getPost('editsupplierreference');
     $SuppliersOfferNo = $this->request->getPost('editsupplierofferno');
     $OtherReferences = $this->request->getPost('editotherreference');
-    $Fincap = "";//$this->request->getPost('editfincap');
+    $Fincap = ""; //$this->request->getPost('editfincap');
     $InsuranceOptions = $this->request->getPost('insuranceStatus');
     $InsuranceNumber = $this->request->getPost('InsuranceNumber');
     $ServiceTypeOptions = $this->request->getPost('PoTypeOptions');
@@ -2862,12 +2862,13 @@ try{
     if (!empty($file)) {
       if ($file && $file->isValid() && !$file->hasMoved()) {
         $requestfilename = $file->getName();
-              $path = ROOTPATH.'public/uploads/POfiles/';
+        $path = ROOTPATH . 'public/uploads/POfiles/';
-              if(!is_dir($path)) { mkdir($path, 0777, true); }
+        if (!is_dir($path)) {
-              if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
+          mkdir($path, 0777, true);
-                log_message('error', 'File already exists in the database'.$requestfilename);
         }
-              else{
+        if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
+          log_message('error', 'File already exists in the database' . $requestfilename);
+        } else {
           $file->move($path, $requestfilename);
           $POList['POFile'] = $requestfilename;
         }
@@ -3073,8 +3074,34 @@ try{
             }
             if ($capitalType == '0') {
               $ImportTaxList = array(
-                'LineItemNo' => $LineItemNo, 'BasicPriceInMTon' => $BasicPriceinmton, 'ProductPrice' => $Productprice, 'LandingCharge' => $LandingCharge, 'AfterLandingCharge' => $AfterLandingCharge, 'CustomDuty' => $CustomDuty, 'AfterCustomDuty' => $AfterCustomDuty, 'CustomEdCess' => $CustomEd, 'CustomSHCess' => $CustomSH, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'Grossdutypayable' => $Grossdutypayable, 'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG, 'QuantityKG' => $QuantityKG, 'AfterCustomSHCess' => $AfterCustomSH, 'AfterCustomEdCess' => $AfterCustomEd, 'TotalValue' => $Totalvalueitem, 'FreightType' => $FreightType, 'NoOfTrip' => $NOOfTrip, 'FreightValue' => $FreightValue, 'AfterFreightValue' => $AfterFreightValue, 'AssessableValue' => $AssessableValue, 'SubTotal' => $SubTotal, 'IGST' => $IGST,
+                'LineItemNo' => $LineItemNo,
-                'AfterIGST' => $AfterIGST, 'DutyImpact' => $DutyImpact, 'NetValue' => $NetValue, 'ClearingCharge' => $ClearingCharge
+                'BasicPriceInMTon' => $BasicPriceinmton,
+                'ProductPrice' => $Productprice,
+                'LandingCharge' => $LandingCharge,
+                'AfterLandingCharge' => $AfterLandingCharge,
+                'CustomDuty' => $CustomDuty,
+                'AfterCustomDuty' => $AfterCustomDuty,
+                'CustomEdCess' => $CustomEd,
+                'CustomSHCess' => $CustomSH,
+                'CreatedBy' => $CreateBy,
+                'CreatedDate' => $createddt,
+                'Grossdutypayable' => $Grossdutypayable,
+                'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG,
+                'QuantityKG' => $QuantityKG,
+                'AfterCustomSHCess' => $AfterCustomSH,
+                'AfterCustomEdCess' => $AfterCustomEd,
+                'TotalValue' => $Totalvalueitem,
+                'FreightType' => $FreightType,
+                'NoOfTrip' => $NOOfTrip,
+                'FreightValue' => $FreightValue,
+                'AfterFreightValue' => $AfterFreightValue,
+                'AssessableValue' => $AssessableValue,
+                'SubTotal' => $SubTotal,
+                'IGST' => $IGST,
+                'AfterIGST' => $AfterIGST,
+                'DutyImpact' => $DutyImpact,
+                'NetValue' => $NetValue,
+                'ClearingCharge' => $ClearingCharge
               );
 
               $ImportList = $this->purchaseorder_model->addImportTax($ImportTaxList);
@@ -3094,8 +3121,34 @@ try{
           }
           if ($capitalType == '0') {
             $ImportTaxList = array(
-              'LineItemNo' => $LineItemNo, 'BasicPriceInMTon' => $BasicPriceinmton, 'ProductPrice' => $Productprice, 'LandingCharge' => $LandingCharge, 'AfterLandingCharge' => $AfterLandingCharge, 'CustomDuty' => $CustomDuty, 'AfterCustomDuty' => $AfterCustomDuty, 'CustomEdCess' => $CustomEd, 'CustomSHCess' => $CustomSH, 'CreatedBy' => $CreateBy, 'CreatedDate' => $createddt, 'Grossdutypayable' => $Grossdutypayable, 'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG, 'QuantityKG' => $QuantityKG, 'AfterCustomSHCess' => $AfterCustomSH, 'AfterCustomEdCess' => $AfterCustomEd, 'TotalValue' => $Totalvalueitem, 'FreightType' => $FreightType, 'NoOfTrip' => $NOOfTrip, 'FreightValue' => $FreightValue, 'AfterFreightValue' => $AfterFreightValue, 'AssessableValue' => $AssessableValue, 'SubTotal' => $SubTotal, 'IGST' => $IGST,
+              'LineItemNo' => $LineItemNo,
-              'AfterIGST' => $AfterIGST, 'DutyImpact' => $DutyImpact, 'NetValue' => $NetValue, 'ClearingCharge' => $ClearingCharge
+              'BasicPriceInMTon' => $BasicPriceinmton,
+              'ProductPrice' => $Productprice,
+              'LandingCharge' => $LandingCharge,
+              'AfterLandingCharge' => $AfterLandingCharge,
+              'CustomDuty' => $CustomDuty,
+              'AfterCustomDuty' => $AfterCustomDuty,
+              'CustomEdCess' => $CustomEd,
+              'CustomSHCess' => $CustomSH,
+              'CreatedBy' => $CreateBy,
+              'CreatedDate' => $createddt,
+              'Grossdutypayable' => $Grossdutypayable,
+              'CustomDutyExpensesPerKG' => $CustomDutyExpensesPerKG,
+              'QuantityKG' => $QuantityKG,
+              'AfterCustomSHCess' => $AfterCustomSH,
+              'AfterCustomEdCess' => $AfterCustomEd,
+              'TotalValue' => $Totalvalueitem,
+              'FreightType' => $FreightType,
+              'NoOfTrip' => $NOOfTrip,
+              'FreightValue' => $FreightValue,
+              'AfterFreightValue' => $AfterFreightValue,
+              'AssessableValue' => $AssessableValue,
+              'SubTotal' => $SubTotal,
+              'IGST' => $IGST,
+              'AfterIGST' => $AfterIGST,
+              'DutyImpact' => $DutyImpact,
+              'NetValue' => $NetValue,
+              'ClearingCharge' => $ClearingCharge
             );
 
 
@@ -3285,28 +3338,65 @@ try{
     $i = 0;
     $str = array();
     $words = array(
-      '0' => '', '1' => 'one', '2' => 'two',
+      '0' => '',
-      '3' => 'three', '4' => 'four', '5' => 'five', '6' => 'six',
+      '1' => 'one',
-      '7' => 'seven', '8' => 'eight', '9' => 'nine',
+      '2' => 'two',
-      '10' => 'ten', '11' => 'eleven', '12' => 'twelve',
+      '3' => 'three',
-      '13' => 'thirteen', '14' => 'fourteen',
+      '4' => 'four',
-      '15' => 'fifteen', '16' => 'sixteen', '17' => 'seventeen',
+      '5' => 'five',
-      '18' => 'eighteen', '19' => 'nineteen', '20' => 'twenty',
+      '6' => 'six',
-      '30' => 'thirty', '40' => 'fourty', '50' => 'fifty',
+      '7' => 'seven',
-      '60' => 'sixty', '70' => 'seventy',
+      '8' => 'eight',
-      '80' => 'eighty', '90' => 'ninety', '06' => 'Zero Six', '01' => 'Zero One', '02' => 'Zero Two', '03' => 'Zero Three', '04' => 'Zero Four', '05' => 'Zero Five', '07' => 'Zero Seven', '08' => 'Zero Eight', '09' => 'Zero Nine'
+      '9' => 'nine',
+      '10' => 'ten',
+      '11' => 'eleven',
+      '12' => 'twelve',
+      '13' => 'thirteen',
+      '14' => 'fourteen',
+      '15' => 'fifteen',
+      '16' => 'sixteen',
+      '17' => 'seventeen',
+      '18' => 'eighteen',
+      '19' => 'nineteen',
+      '20' => 'twenty',
+      '30' => 'thirty',
+      '40' => 'fourty',
+      '50' => 'fifty',
+      '60' => 'sixty',
+      '70' => 'seventy',
+      '80' => 'eighty',
+      '90' => 'ninety',
+      '06' => 'Zero Six',
+      '01' => 'Zero One',
+      '02' => 'Zero Two',
+      '03' => 'Zero Three',
+      '04' => 'Zero Four',
+      '05' => 'Zero Five',
+      '07' => 'Zero Seven',
+      '08' => 'Zero Eight',
+      '09' => 'Zero Nine'
     );
     $words1 = array(
       '2' => 'twenty',
-      '3' => 'thirty', '4' => 'fourty',
+      '3' => 'thirty',
-      '5' => 'fifty', '6' => 'sixty', '7' => 'seventy',
+      '4' => 'fourty',
-      '8' => 'eighty', '9' => 'ninety'
+      '5' => 'fifty',
+      '6' => 'sixty',
+      '7' => 'seventy',
+      '8' => 'eighty',
+      '9' => 'ninety'
     );
     $words12 = array(
       '11' => 'eleven',
-      '12' => 'twelve', '13' => 'thirteen', '14' => 'fourteen',
+      '12' => 'twelve',
-      '15' => 'fifteen', '16' => 'sixteen', '17' => 'seventeen',
+      '13' => 'thirteen',
-      '18' => 'eighteen', '19' => 'nineteen', '20' => 'twenty',
+      '14' => 'fourteen',
+      '15' => 'fifteen',
+      '16' => 'sixteen',
+      '17' => 'seventeen',
+      '18' => 'eighteen',
+      '19' => 'nineteen',
+      '20' => 'twenty',
     );
     $digits = array('', 'hundred', 'thousand', 'lakh', 'crore');
     while ($i < $digits_1) {
@@ -3373,28 +3463,56 @@ try{
     $i = 0;
     $str = array();
     $words = array(
-      '0' => '', '1' => 'one', '2' => 'two',
+      '0' => '',
-      '3' => 'three', '4' => 'four', '5' => 'five', '6' => 'six',
+      '1' => 'one',
-      '7' => 'seven', '8' => 'eight', '9' => 'nine',
+      '2' => 'two',
-      '10' => 'ten', '11' => 'eleven', '12' => 'twelve',
+      '3' => 'three',
-      '13' => 'thirteen', '14' => 'fourteen',
+      '4' => 'four',
-      '15' => 'fifteen', '16' => 'sixteen', '17' => 'seventeen',
+      '5' => 'five',
-      '18' => 'eighteen', '19' => 'nineteen', '20' => 'twenty',
+      '6' => 'six',
-      '30' => 'thirty', '40' => 'fourty', '50' => 'fifty',
+      '7' => 'seven',
-      '60' => 'sixty', '70' => 'seventy',
+      '8' => 'eight',
-      '80' => 'eighty', '90' => 'ninety'
+      '9' => 'nine',
+      '10' => 'ten',
+      '11' => 'eleven',
+      '12' => 'twelve',
+      '13' => 'thirteen',
+      '14' => 'fourteen',
+      '15' => 'fifteen',
+      '16' => 'sixteen',
+      '17' => 'seventeen',
+      '18' => 'eighteen',
+      '19' => 'nineteen',
+      '20' => 'twenty',
+      '30' => 'thirty',
+      '40' => 'fourty',
+      '50' => 'fifty',
+      '60' => 'sixty',
+      '70' => 'seventy',
+      '80' => 'eighty',
+      '90' => 'ninety'
     );
     $words1 = array(
       '2' => 'twenty',
-      '3' => 'thirty', '4' => 'fourty',
+      '3' => 'thirty',
-      '5' => 'fifty', '6' => 'sixty', '7' => 'seventy',
+      '4' => 'fourty',
-      '8' => 'eighty', '9' => 'ninety'
+      '5' => 'fifty',
+      '6' => 'sixty',
+      '7' => 'seventy',
+      '8' => 'eighty',
+      '9' => 'ninety'
     );
     $words12 = array(
       '11' => 'eleven',
-      '12' => 'twelve', '13' => 'thirteen', '14' => 'fourteen',
+      '12' => 'twelve',
-      '15' => 'fifteen', '16' => 'sixteen', '17' => 'seventeen',
+      '13' => 'thirteen',
-      '18' => 'eighteen', '19' => 'nineteen', '20' => 'twenty',
+      '14' => 'fourteen',
+      '15' => 'fifteen',
+      '16' => 'sixteen',
+      '17' => 'seventeen',
+      '18' => 'eighteen',
+      '19' => 'nineteen',
+      '20' => 'twenty',
     );
     $digits = array('', 'hundred', 'thousand', 'lakh', 'crore');
     while ($i < $digits_1) {

app/Controllers/User.php

@@ -901,7 +901,7 @@ class User extends BaseController
         $data['userRecords'] = $this->user_model->userListing();
 
         $this->global['pageTitle'] = 'User Listing';
-
+        // dd($data);
         $this->loadViews("userListing", $this->global, $data, NULL);
         //}
     }
@@ -1095,10 +1095,10 @@ class User extends BaseController
         $data['EmpRole'] =   $this->user_model->GetRoleNameByUserID($Uid);
         $data['AccessDept'] = $this->costcenter_model->getaccessDept($Empid);
 
-        // $data['userInfo'] = $this->user_model->getUserInfo($userId);
+        // $data['userInfo'] = $this->user_model->getUserInfo($Uid);
+        $data['userId'] = $Uid;
 
         $this->global['pageTitle'] = 'Edit User';
-
         $this->loadViews("editOld", $this->global, $data, NULL);
         //}
     }
@@ -1126,7 +1126,7 @@ class User extends BaseController
         // } else {
         $EmpID = $this->request->getPost('EmpList');
         $role = $this->request->getPost('role');
-        $password = $this->request->getPost('password');
+        // $password = $this->request->getPost('password');
 
         $updatedDate =  get_current_date_time();
 
@@ -1134,7 +1134,8 @@ class User extends BaseController
 
         $userInfo = array();
 
-        $userInfo = array('password' => getHashedPassword($password), 'roleId' => $role, 'EmpId' => $EmpID, 'updatedDtm' => $updatedDate);
+        // $userInfo = array('password' => getHashedPassword($password), 'roleId' => $role, 'EmpId' => $EmpID, 'updatedDtm' => $updatedDate);
+        $userInfo = array('roleId' => $role, 'EmpId' => $EmpID, 'updatedDtm' => $updatedDate);
 
         $result = $this->user_model->editUser($userInfo,  $EmpID);
 
@@ -1168,6 +1169,34 @@ class User extends BaseController
         echo 'Succssfully change the user status to InAcive';
     }
 
+    
+    function userChangePassword()
+    {
+        helper('form'); 
+        $userId = $this->request->getPost('userId');
+        $newPassword = $this->request->getPost('password');
+        $cNewPassword = $this->request->getPost('cpassword');
+
+        if ($newPassword == $cNewPassword) {
+                $usersData = array(
+                    'password' => getHashedPassword($newPassword),
+                    'updatedBy' => $userId,
+                    'updatedDtm' => date('Y-m-d H:i:sa')
+                );
+                $result = $this->user_model->changePassword($userId, $usersData);
+                if ($result > 0) {
+                    $this->session->setFlashdata('success', 'Password updation successful');
+                } else {
+                    $this->session->setFlashdata('error', 'Password updation failed');
+                }
+
+                return redirect()->route('userListing');
+        } else {
+            $this->session->setFlashdata('error', 'New Password and Confirm Password Not Same');
+            return redirect()->route('userListing');
+        }
+    }
+
     /**
      * This function is used to load the change password screen
      */
@@ -1193,8 +1222,9 @@ class User extends BaseController
         // if ($this->validator->run() == FALSE) {
         $oldPassword = $this->request->getPost('oldPassword');
         $newPassword = $this->request->getPost('newPassword');
-            $cNewPassword = $this->request->getPost('newPassword');
+        $cNewPassword = $this->request->getPost('cNewPassword');
-        if($newPassword === $cNewPassword && $oldPassword != $newPassword) {
+
+        if ($newPassword == $cNewPassword) {
             $resultPas = $this->user_model->matchOldPassword($this->vendorId, $oldPassword);
             if (empty($resultPas)) {
                 $this->session->setFlashdata('nomatch', 'Your old password not correct');
@@ -1205,7 +1235,6 @@ class User extends BaseController
                     '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');
@@ -1215,6 +1244,9 @@ class User extends BaseController
 
                 return redirect()->route('loadChangePass');
             }
+        } else {
+            $this->session->setFlashdata('error', 'New Password and Confirm Password Not Same');
+            return redirect()->route('loadChangePass');
         }
     }
 

app/Models/Expense_model.php

@@ -9,7 +9,7 @@ class Expense_model extends Model
     protected $primaryKey = 'id'; // Primary key
 
     protected $allowedFields = [
-        'transporter_file', 'supplier_id', 'remarks', 'cost', 'gst', 'total', 'status', 'payment_method'
+        'transporter_file', 'supplier_id', 'remarks', 'item_description', 'cost', 'cgst', 'sgst', 'igst', 'total', 
     ];
 
     // Retrieve all active expenses

app/Views/EditservicePurchaseorder.php

@@ -868,7 +868,7 @@ if (!empty($getlogpodtl)) {
 										<label>Delivery Date<span class="text-danger">*</span></label>
 										<div>
 											<?php
-											$data = array('type'=>'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+											$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
 											echo form_input($data);
 											?>
 										</div>

app/Views/addEmployeenew.php

@@ -377,10 +377,6 @@
 </script>
 <div class="content-page">
     <div class="content">
-        <div class="row">
-            <div class="col-xl-12">
-                <div class="card">
-                    <div class="card-body">
         <div class="row">
             <div class="col-6">
                 <div class="page-title-box page-title-box-alt">
@@ -391,6 +387,10 @@
                 <a class=" btn btn-dark waves-effect waves-light" href="<?php echo base_url() ?>employeeListing"><span class="bold">Back</span></a>
             </div>
         </div>
+        <div class="row">
+            <div class="col-xl-12">
+                <div class="card">
+                    <div class="card-body">
                         <div id="rootwizard">
                             <ul class="nav nav-pills nav-justified form-wizard-header mb-3">
                                 <li class="nav-item" data-target-form="#accountForm">
@@ -411,7 +411,7 @@
                                     <a href="#third" data-toggle="tab" class="nav-link">
                                         <!-- <a data-toggle="tab" class="nav-link"> -->
                                         <span class="number">3</span>
-                                        <span class="d-none d-sm-inline">Bank Details & Emp Benefits</span>
+                                        <span class="d-none d-sm-inline">Bank & Emp Benefits</span>
                                     </a>
                                 </li>
                                 <li class="nav-item" data-target-form="#proofForm">
@@ -450,29 +450,30 @@
                                             </div>
                                             <div class="col-md-10">
                                                 <div class="row">
-                                                    <div class="col-md-2 pad">
+                                                    <div class="col-md-4 pad">
                                                         <span>Full Name</span><span class="badge">*</span>
                                                         <input type="text" name="FirstName"
                                                             onkeypress="return onlyAlphabets(event);" maxlength="100"
                                                             id="FirstName" class="form-control" required>
                                                     </div>
 
-                                                    <div class="col-md-2 pad"><span>Father / Husband Name</span><span
+                                                    <div class="col-md-4 pad"><span>Father / Husband Name</span><span
                                                             class="badge">*</span>
                                                         <input type="text" name="FatherName"
                                                             onkeypress="return onlyAlphabets(event);" id="FatherName"
                                                             maxlength="200" class="form-control" required>
                                                     </div>
 
-                                                    <div class="col-md-2 pad"><span>Contact Number</span><span
+                                                    <div class="col-md-4 pad"><span>Contact Number</span><span
                                                             class="badge">*</span>
                                                         <input type="text" name="ContactNumber"
                                                             onchange="return getMobileValidation();" id="ContactNumber"
                                                             required pattern="(.){10,10}" maxlength="10"
                                                             class="form-control" onkeypress="return isNumberKey(event)">
                                                     </div>
-
+                                                </div>
-                                                    <div class="col-md-2 pad"><span>Gender</span><span
+                                                <div class="row">
+                                                    <div class="col-md-4 pad"><span>Gender</span><span
                                                             class="badge">*</span>
                                                         <select id="gender" name="gender" type="text" required
                                                             class="form-control select2">
@@ -489,27 +490,27 @@
                                                             ?>
                                                         </select>
                                                     </div>
-                                                    <div class="col-md-2 pad"><span>Date Of Birth</span><span
+                                                    <div class="col-md-4 pad"><span>Date Of Birth</span><span
                                                             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">
                                                     </div>
-                                                </div>
+                                                    <div class="col-md-4 pad"><span>Age</span>
-                                                <div class="row">
-                                                    <div class="col-md-2 pad"><span>Age</span>
                                                         <input type="text" name="age" id="age" class="form-control"
                                                             readonly>
                                                     </div>
-                                                    <div class="col-md-2 pad"><span>Personal Email ID</span>
-                                                        <input type="email" name="emailid" id="emailid" maxlength="100"
-                                                            class="form-control">
                                                 </div>
-                                                    <div class="col-md-2 pad"> <span>Official Email ID</span>
+                                                <div class="row">
+                                                    <div class="col-md-4 pad"><span>Personal Email ID</span><span class="badge">*</span>
+                                                        <input type="email" name="emailid" id="emailid" maxlength="100"
+                                                            class="form-control" required>
+                                                    </div>
+                                                    <div class="col-md-4 pad"> <span>Official Email ID</span>
                                                         <input type="email" name="comemailid" id="mail" maxlength="100"
                                                             class="form-control">
                                                     </div>
-                                                    <div class="col-md-2 pad">
+                                                    <div class="col-md-4 pad">
 
                                                         <span>Blood group</span><span class="badge">*</span>
                                                         <select id="bloodgroup" name="bloodgroup" required
@@ -527,8 +528,9 @@
                                                             ?>
                                                         </select>
                                                     </div>
-
+                                                </div>
-                                                    <div class="col-md-2 pad">
+                                                <div class="row">
+                                                    <div class="col-md-4 pad">
                                                         <span>Marital Status</span><span class="badge">*</span>
                                                         <select id="MartialStatus" name="MartialStatus" type="text"
                                                             required placeholder="Marital status"
@@ -546,17 +548,17 @@
                                                             ?>
                                                         </select>
                                                     </div>
-                                                </div>
-                                                <div class="row">
                                                     <div class="col-md-4 pad">
                                                         <span>Current Address</span><span class="badge">*</span>
                                                         <input type="text" id="currentaddress" required name="currentaddress"
                                                             pattern=".{0,500}" maxlength="500" class="form-control">
                                                     </div>
-                                                    <div class="col-md-2 pad" style="margin-top: 18px;">
+                                                    <div class="col-md-4 pad" style="margin-top: 18px;">
                                                         <input type="checkbox" id="checksame" name="sameaddress"
                                                             onclick="CheckClick"> Current address same as permanent address
                                                     </div>
+                                                    </div>
+                                                <div class="row">
                                                     <div class="col-md-4 pad">
                                                         <span>Permanent Address</span><span
                                                             class="badge">*</span>
@@ -564,16 +566,15 @@
                                                             name="permanentaddress" pattern=".{0,500}" maxlength="500"
                                                             class="form-control">
                                                     </div>
-                                                </div>
+                                            
-                                                <div class="row">
+                                                    <div class="col-md-4 pad">
-                                                    <div class="col-md-3 pad">
                                                         <span>Emergency Contact Name</span>
                                                         <input type="text" id="emergencycontactname"
                                                             onkeypress="return onlyAlphabets(event);" maxlength="100"
                                                             name="emergencycontactname" class="form-control">
                                                     </div>
 
-                                                    <div class="col-md-3">
+                                                    <div class="col-md-4">
                                                         <span>Emergency Contact Number</span>
                                                         <input type="text" id="emergencycontactnumber"
                                                             name="emergencycontactnumber"
@@ -594,7 +595,7 @@
                                 </div>
 
                                 <div class="tab-pane fade" id="second">
-                                    <form id="profileForm" method="post" action="#" class="form-horizontal">
+                                    <form id="profileForm" method="post" action="#" class="form-horizontal" style="height: 250px;">
                                         <div class="row">
                                             <div class="col-md-1">
                                             </div>
@@ -679,8 +680,7 @@
                                                             onchange=" return getValidReferNumber();" maxlength="10"
                                                             onkeypress="return isNumberKey(event)" class="form-control">
                                                     </div>
-                                                </div>
+                                               
-                                                <div class="row" style="margin-bottom: 20px;">
 
                                                     <div class="col-md-3"><span>Work Location</span><span class="badge">*</span>
                                                         <select type="text" id="work_location" name="work_location" required
@@ -966,7 +966,7 @@
                                 </div>
 
                                 <div class="tab-pane fade" id="fivth">
-                                    <form id="fileForm" method="post" action="#" class="form-horizontal" enctype="multipart/form-data">
+                                    <form id="fileForm" method="post" action="#" class="form-horizontal" enctype="multipart/form-data" style="height: 250px;">
                                         <div class="row">
                                             <div class="col-md-1">
                                             </div>

app/Views/addUser.php

@@ -166,7 +166,9 @@
                 $.ajax({
                     url: "<?php echo base_url() ?>fetchEmployeeDetails",
                     type: 'POST',
-                data: { EmpID: empID },
+                    data: {
+                        EmpID: empID
+                    },
                     success: function(data) {
                         console.log(data);
 
@@ -199,8 +201,7 @@
 
     $('#addPop').click(function() {
         if ($('#distriList option:selected').val() != null) {
-            if ($('#distriList option:selected').val() == 0) {
+            if ($('#distriList option:selected').val() == 0) {} else {
-            } else {
                 var tempSelect = $('#distriList option:selected').val();
                 var tempText = $('#distriList option:selected').text();
                 var o = new Option(tempText, tempSelect);
@@ -227,7 +228,7 @@
 </script>
 
 <script>
-function Validate() {
+    function Validate() {
         var isValid = true;
 
         var fname = document.getElementById('FirstName').value;
@@ -251,6 +252,5 @@ function Validate() {
         }
 
         return isValid;
-}
+    }
 </script>
-

app/Views/addconfig.php

@@ -3,6 +3,8 @@
 		background-color: #ddd;
 	}
 </style>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.13.6/underscore-min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/lodash.js/4.17.21/lodash.min.js"></script>
 
 <div class="content-page">
 	<div class="content">
@@ -90,6 +92,7 @@
 									</div>
 								</div>
 								<div class="col-md-12 text-right">
+									<input type="hidden" name="txtRowCount" id="txtRowCount" />
 									<input type="reset" id="reset" class="btn btn-reset" style="background-color: red;color: white;    margin-right: 15px;width: 80px;" value="Reset" />
 									<input type="submit" onclick="return Validate();" value="Submit" class="btn btn-success">
 								</div>
@@ -118,8 +121,7 @@
 					<?php echo session()->getFlashdata('success'); ?>
 				</div>
 			<?php } ?>
-		</div>
+		</div> <!-- end row -->
-		t <!-- end row -->
 	</div> <!-- container -->
 </div> <!-- content -->
 
@@ -145,7 +147,7 @@
 							</div>
 							<div class="col-md-5">
 
-								<input class="form-control" name="ConfigValue" class="form-control" id="ConfigValue" type="text">
+								<input class="form-control" name="ConfigValue" class="form-control" required="true" id="ConfigValue" type="text">
 
 							</div>
 						</div>
@@ -156,8 +158,8 @@
 
 			<!-- Modal Footer -->
 			<div class="modal-footer">
-				<a class="btn btn-cancel" data-dismiss="modal" value="Cancel">Cancel</a>
+				<a class="btn btn-success" style="background-color: grey;border: none;margin-right:10px" data-dismiss="modal" value="Cancel">Cancel</a>
-				<a class="btn btn-success font tempClickAdd" ID="tempClickAdd" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
+				<a class="btn btn-success font tempClickAdd" ID="tempClickAdd"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add</span></a>
 			</div>
 		</div>
 	</div>
@@ -194,7 +196,7 @@
 			</div>
 			<!-- Modal Footer -->
 			<div class="modal-footer">
-				<a class="btn btn-cancel" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
+				<a class="btn btn-success" style="background-color: grey;border: none;margin-right:10px" data-dismiss="modal" style="margin-top: -24px;" value="Cancel">Cancel</a>
 				<a class="btn btn-success font tempClickEdit" ID="tempClickEdit" style="margin-top: -24px;"><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Edit</span></a>
 			</div>
 		</div>
@@ -213,27 +215,29 @@
 
 
 		<td>
-			<a data-target='#Edit' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#Edit"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ConfigValue%> Budget details"></i>&nbsp;&nbsp;&nbsp;</a>
+			<a class="editConfig" data-target='#Edit' data-id="<%=index%>" data-userid="<%=index%>" data-toggle="modal" href="#Edit"><i class="fa fa-pencil" data-toggle="tooltip" title="Click here to view/Edit the  <%=ConfigValue%> Budget details"></i>&nbsp;&nbsp;&nbsp;</a>
 
 
 		</td>
 	</tr>
 </script>
 <script>
+	$(document).ready(function() {
+
 		var index = '1';
 		var numbers = /^[0-9]+$/;
 		var userid = '';
 
 		$("#Edit").on("shown.bs.modal", function(e) {
 			userid = $(e.relatedTarget).data('userid');
+
 			var s = $('#configtable tr:eq(' + userid + ') td:eq(1)').text()
 			$("#EditConfigValue").val(s);
 		});
 
 
 		$('.tempClickAdd').click(function() {
-
+			if ($("#ConfigValue").val() != '-1' && $("#ConfigValue").val() != null && $("#ConfigValue").val() != '') {
-		if ($("#ConfigValue").val() != '-1') {
 
 				$('#ConfigValue').show();
 				var temp = index;
@@ -249,24 +253,30 @@
 
 
 				var template = jQuery("#tempList").html();
+				var html = `
+	            <tr id="${temp}">
+                    <td>${temp}</td>
+                    <td>${ConfigValue}</td>
+                    <td>
+                            <a class="editConfig" data-target='#Edit' data-id="${temp}" data-index="${index}" data-userid="${temp}" data-toggle="modal" href="#Edit">
+                                <i class="ri-pencil-fill"></i>
+                                &nbsp;&nbsp;&nbsp;
+                            </a> 
+                        </td>
+                </tr>`;
+				$('#tempAppend').append(html);
 
-
+				var theForm = $("#addconfig");
-			$('#tempAppend').append(_.template(template, {
-				index: temp,
-				ConfigValue: ConfigValue
-			}));
-
-
-			var theForm = $(".addconfig");
 
 				addHidden(theForm, "ConfigValue" + temp, ConfigValue);
 
 
 				$('#txtRowCount').val(temp);
 
+				$('#AddConfiguration').modal('hide');
 				//CountRows();
 			} else {
-			alert('Please enter all the values');
+				alert('Please enter a value');
 
 			}
 
@@ -277,10 +287,10 @@
 			var input = document.createElement('input');
 			input.type = 'hidden';
 			input.name = key;
-		'name-as-seen-at-the-server';
+			// 'name-as-seen-at-the-server';
 			input.value = value;
 			input.id = key;
-		theForm.append(input);
+			$(theForm).append(input);
 		}
 
 
@@ -302,6 +312,7 @@
 
 
 
+				$("#AddConfiguration").modal('hide');
 
 			} else {
 				alert('Please enter all the values');
@@ -371,4 +382,5 @@
 			}
 
 		}
+	});
 </script>

app/Views/editOld.php

@@ -1,5 +1,3 @@
-
-
 <?php
 
 $EmpId = '';
@@ -9,28 +7,22 @@ $ContactNo = '';
 $EmailId = '';
 $Role = '';
 $Designation = '';
- $RoleName = '';
+$RoleName = '';
-if(!empty($EmpRole))
+if (!empty($EmpRole)) {
-{
+    foreach ($EmpRole as $Er) {
-    foreach ($EmpRole as $Er)
-    {
         $Role =  $Er->roleId;
         $RoleName =  $Er->role;
     }
 }
 
-if(!empty($EmpList))
+if (!empty($EmpList)) {
-{
+    foreach ($EmpList as $Emp) {
-    foreach ($EmpList as $Emp)
-    {
         $EmpId = $Emp->EmpID;
         $FirstName = $Emp->FirstName;
         $LastName = $Emp->LastName;
         $ContactNo = $Emp->ContactNumber;
         $EmailId = $Emp->EmailId;
-        
         $Designation = $Emp->Designation;
-		
     }
 }
 
@@ -38,20 +30,19 @@ if(!empty($EmpList))
 
 <div class="content-page">
     <div class="content">
-        <!-- Start Content-->
         <div class="container-fluid">
-            <!-- start page title -->
             <div class="row" style="margin-bottom: 10px;">
                 <div class="col-6">
                     <div class="page-title-box page-title-box-alt">
-                        <h4 class="page-title">Edit User <?= ' - '.$EmpId; ?> Details</h4>
+                        <h4 class="page-title">Edit User <?= ' - ' . $EmpId; ?> Details</h4>
                     </div>
                 </div>
                 <div class="col-6 text-right">
                     <a class="btn btn-dark waves-effect waves-light" href="<?php echo base_url(); ?>userListing"><span class="bold">Back</span></a>
                 </div>
             </div>
-            <!-- end page title -->
+
+            <!-- User Details Form -->
             <div class="row">
                 <div class="col-12">
                     <div class="card">
@@ -77,7 +68,6 @@ if(!empty($EmpList))
                                         </div>
                                     </div>
                                     <div class="form-row">
-                                        
                                         <div class="col-md-3">
                                             <label for="MailID">Email address</label>
                                             <input type="text" class="form-control required email" value="<?php echo $EmailId ?>" readonly id="MailID" name="MailID" maxlength="128">
@@ -86,18 +76,23 @@ if(!empty($EmpList))
                                             <label for="ContactNo">Contact Number</label>
                                             <input type="text" class="form-control required digits" value="<?php echo $ContactNo ?>" readonly id="ContactNo" name="ContactNo" minlength="10" maxlength="10">
                                         </div>
-                                    </div>
-                                    <div class="form-row">
                                         <div class="col-md-3">
-                                            <label for="password">Password</label>
+                                            <label for="Role">Role</label>
-                                            <input type="password" class="form-control" id="password" required name="password" maxlength="10">
+                                            <select class="form-control required" id="role" name="role" required>
-                                        </div>
+                                                <option value="0">Select Role</option>
-                                        <div class="col-md-3">
+                                                <?php
-                                            <label for="cpassword">Confirm Password</label>
+                                                if (!empty($roles)) {
-                                            <input type="password" class="form-control equalTo" id="cpassword" name="cpassword" maxlength="10">
+                                                    foreach ($roles as $rl) {
+                                                        $selected = ($rl->roleId == $Role) ? 'selected' : '';
+                                                ?>
+                                                        <option value="<?php echo $rl->roleId ?>" <?php echo $selected; ?>><?php echo $rl->role ?></option>
+                                                <?php
+                                                    }
+                                                }
+                                                ?>
+                                            </select>
                                         </div>
                                     </div>
-                                    
                                 </div>
                                 <div class="form-group text-right mt-3">
                                     <input type="hidden" name="txtEmpid" id="txtEmpid" value="<?php echo $EmpId ?>">
@@ -105,6 +100,8 @@ if(!empty($EmpList))
                                     <input type="submit" class="btn btn-success" value="Submit">
                                 </div>
                             </form>
+
+                            <!-- Flash messages for errors and success -->
                             <?php
                             $listErrors = session()->getFlashdata('listErrors');
                             if ($listErrors) {
@@ -114,6 +111,7 @@ if(!empty($EmpList))
                                     <?php echo session()->getFlashdata('listErrors'); ?>
                                 </div>
                             <?php } ?>
+
                             <?php
                             $error = session()->getFlashdata('error');
                             if ($error) {
@@ -123,6 +121,7 @@ if(!empty($EmpList))
                                     <?php echo session()->getFlashdata('error'); ?>
                                 </div>
                             <?php } ?>
+
                             <?php
                             $success = session()->getFlashdata('success');
                             if ($success) {
@@ -134,41 +133,59 @@ if(!empty($EmpList))
                             <?php } ?>
                         </div>
                     </div>
-                </div> <!-- end card -->
-            </div><!-- end col -->
                 </div>
-        <!-- end row -->
+            </div>
-    </div> <!-- container -->
+
-</div> <!-- content -->
+            <!-- Change Password Form -->
+            <div class="row">
+                <div class="col-12">
+                    <div class="card">
+                        <div class="card-body">
+                            <form role="form" action="<?php echo base_url() ?>userChangePassword" method="post" id="changePasswordForm">
+                                <input type="hidden" class="form-control" id="userId" name="userId" value="<?= $userId ?>">
+                                <div class="form-row">
+                                    <div class="col-md-3">
+                                        <label for="password">New Password</label>
+                                        <input type="password" class="form-control" id="password" required name="password" maxlength="10">
+                                    </div>
+                                    <div class="col-md-3">
+                                        <label for="cpassword">Confirm New Password</label>
+                                        <input type="password" class="form-control equalTo" id="cpassword" name="cpassword" maxlength="10">
+                                    </div>
+                                </div>
+                                <div class="form-group text-right mt-3">
+                                    <input type="hidden" name="txtEmpid" id="txtEmpid" value="<?php echo $EmpId ?>">
+                                    <input type="submit" class="btn btn-primary" value="Change Password">
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
 
 
 <script src="<?php echo base_url(); ?>public/assets/js/editUser.js" type="text/javascript"></script>
 
 <script type="text/javascript">
-    
+    $('#addPop').click(function() {
-
-
-
-      $('#addPop').click(function () {
         if ($('#distriList option:selected').val() != null) {
-            if($('#distriList option:selected').val()==0 ){
+            if ($('#distriList option:selected').val() == 0) {} else {
-            }
-            else{
                 var tempSelect = $('#distriList option:selected').val();
-              var Eid= $('#txtEmpid').val();
+                var Eid = $('#txtEmpid').val();
                 var tempText = $('#distriList option:selected').text();
 
-              var o = new Option(tempText,tempSelect);
+                var o = new Option(tempText, tempSelect);
                 var hidval = tempSelect;
                 //salert(orgVal);
                 var Selectedval = ''
 
-              if(orgVal != '')
+                if (orgVal != '') {
-              {
                     Selectedval = orgVal + ':' + hidval;
-              }
+                } else {
-              else
-              {
                     Selectedval = hidval
                 }
 
@@ -186,13 +203,14 @@ if(!empty($EmpList))
 
                 $('#content').loader('show');
                 $.ajax({
-                data:{Eid:Eid},    
+                    data: {
+                        Eid: Eid
+                    },
 
-                type:"POST",
+                    type: "POST",
-                url:"<?php echo base_url() ?>user/Adduserdepartment", 
+                    url: "<?php echo base_url() ?>user/Adduserdepartment",
-                success:function(data) {
+                    success: function(data) {
-                if(data)
+                        if (data) {
-                {
                             $('#content').loader('hide');
                             alert(data);
                             $('#txtRowCount').val('');
@@ -215,8 +233,7 @@ if(!empty($EmpList))
 
 
             }
-     }
+        } else {
-          else {
             alert("Before add please select any position.");
         }
     });
@@ -224,15 +241,14 @@ if(!empty($EmpList))
 
 
 
-      $('#removePop').click(function () {
+    $('#removePop').click(function() {
         if ($('#selectDistriList option:selected').val() != null) {
-            if($('#selectDistriList option:selected').val() == 0){
+            if ($('#selectDistriList option:selected').val() == 0) {
                 //alert('cannot removed');
-             }
+            } else {
-            else{
                 var tempSelect = $('#selectDistriList option:selected').val();
 
-              var Eid= $('#txtEmpid').val();
+                var Eid = $('#txtEmpid').val();
 
 
                 $('#selectDistriList option:selected').remove().appendTo('#distriList');
@@ -246,12 +262,13 @@ if(!empty($EmpList))
 
                 $('#content').loader('show');
                 $.ajax({
-                data:{Eid:Eid},  
+                    data: {
-                type:"POST",
+                        Eid: Eid
-                url:"<?php echo base_url() ?>user/Deleteuserdepartment", 
+                    },
-                success:function(data) {
+                    type: "POST",
-                if(data)
+                    url: "<?php echo base_url() ?>user/Deleteuserdepartment",
-                {
+                    success: function(data) {
+                        if (data) {
                             $('#content').loader('hide');
                             alert(data);
                             $('#txtRowCount').val('');
@@ -268,18 +285,8 @@ if(!empty($EmpList))
 
             }
 
-          } 
+        } else {
-
-          else 
-          {
             alert("Before remove please select any position.");
         }
     });
-
-
-
-
-
-
-
 </script>>

app/Views/editRevenuepurchaseorder.php

@@ -1958,7 +1958,7 @@ if (!empty($getlogpodtl)) {
 										<label>Delivery Date<span class="text-danger">*</span></label>
 										<div class="form-group">
 											<?php
-											$data = array('type' => 'date','name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+											$data = array('name' => 'Deliverydt', 'value' => set_value('Deliverydt', $Deliverydt), 'id' => 'Deliverydt',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
 											echo form_input($data);
 											?>
 
@@ -1986,7 +1986,7 @@ if (!empty($getlogpodtl)) {
 										<label>Purchase Order Date</label>
 										<div class="form-group">
 											<?php
-											$data = array('type'=>'date','name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
+											$data = array('name' => 'PODate', 'value' => set_value('PODate', $PODate), 'id' => 'PODate',  'class' => 'form-control num', 'required' => 'true', 'onkeypress' => 'return false;');
 											echo form_input($data);
 											?> <input type="hidden" name="b4podate" id="b4podate" value="<?php echo $PODate; ?>">
 										</div>

app/Views/editconfig.php

@@ -171,7 +171,7 @@ if (!empty($master)) {
 
                         <!-- Modal Footer -->
                         <div class="modal-footer">
-                            <a class="btn btn-cancel" data-dismiss="modal">Cancel</a>
+                            <a class="btn btn-success" style="background-color: grey;border: none;margin-right:10px" data-dismiss="modal">Cancel</a>
                             <a class="btn btn-success font tempClickAdd" id="tempClickAdd"><i class="fa fa-plus"></i>&nbsp;&nbsp;Add</a>
                         </div>
                     </div>
@@ -238,7 +238,7 @@ if (!empty($master)) {
 
                         <!-- Modal Footer -->
                         <div class="modal-footer">
-                            <a class="btn btn-cancel" data-dismiss="modal">Cancel</a>
+                            <a class="btn btn-success" style="background-color: grey;border: none;margin-right:10px" data-dismiss="modal">Cancel</a>
                             <a class="btn btn-success font tempClickUpdate" id="tempClickUpdate"><i class="fa fa-pencil"></i>&nbsp;&nbsp;Update</a>
                         </div>
                     </div>
@@ -266,6 +266,8 @@ if (!empty($master)) {
     </tr>
 </script>
 <script>
+    $(document).ready(function() {
+
         var index = $('#txtRowCount').val();
         var userid = '';
 
@@ -273,7 +275,7 @@ if (!empty($master)) {
             userid = $(e.relatedTarget).data('userid');
             $('#key').val($('#configtable tr:eq(' + userid + ') td:eq(0)').text());
             $('#Config_ID').val($('#ConfigId').val());
-		$('#EditConfigValue').val($('#configtable tr:eq(' + userid + ') td:eq(1)').text());
+            $('#configValue').val($('#configtable tr:eq(' + userid + ') td:eq(1)').text());
             $('#ConfigVal' + userid).val($('#configtable tr:eq(' + userid + ') td:eq(1)').text());
 
         });
@@ -281,12 +283,10 @@ if (!empty($master)) {
         $('.tempClickAdd').click(function() {
 
             var cid = $('#ConfigId').val()
-
+			if ($("#AddConfigValue").val() != '-1' && $("#AddConfigValue").val() != null && $("#AddConfigValue").val() != '') {
-		if ($("#AddConfigValue").val() != '-1') {
 
                 $('#AddConfigValue').show();
 
-
                 var ConfigValue = $("#AddConfigValue").val();
 
                 $('#AddConfigValue').val('');
@@ -297,11 +297,18 @@ if (!empty($master)) {
 
 
                 var template = jQuery("#tempList").html();
-
+                var html = `
-			$('#tempAppend').append(_.template(template, {
+	            <tr id="${temp}">
-				index: temp,
+                    <td>${temp}</td>
-				ConfigValue: ConfigValue,
+                    <td>${ConfigValue}</td>
-			}));
+                    <td>
+                            <a class="editConfig" data-target='#Edit' data-id="${temp}" data-index="${index}" data-userid="${temp}" data-toggle="modal" href="#Edit">
+                                <i class="ri-pencil-fill"></i>
+                                &nbsp;&nbsp;&nbsp;
+                            </a> 
+                        </td>
+                </tr>`;
+                $('#tempAppend').append(html);
 
                 var theForm = $(".editConfig");
 
@@ -311,6 +318,8 @@ if (!empty($master)) {
                 $('#txtRowCount').val(temp);
 
                 //CountRows();
+                $('#AddConfiguration').modal('hide');
+
             } else {
                 alert('Please enter all the values');
 
@@ -329,14 +338,14 @@ if (!empty($master)) {
             theForm.append(input);
         }
 
-	$('.tempClickEdit').click(function() {
+        $('.tempClickUpdate').click(function() {
 
 
-		if ($("#EditConfigValue").val() != '') {
+            if ($("#configValue").val() != '') {
 
 
                 var temp = index;
-			var ConfigValue = $("#EditConfigValue").val();
+                var ConfigValue = $("#configValue").val();
                 //alert(userid);
 
                 $('#configtable tr:eq(' + userid + ') td:eq(1)').text(ConfigValue);
@@ -345,10 +354,10 @@ if (!empty($master)) {
                 //$('#hConfigValue'+userid).val(ConfigValue);
 
                 $('#Config_ID' + userid).val($('#ConfigId').val());
-			$('#EditConfigValue' + userid).val(ConfigValue);
+                $('#configValue' + userid).val(ConfigValue);
                 $("#configVal" + userid).val(ConfigValue);
 
-
+                $('#Edit').modal('hide');
             } else {
                 alert('Please enter all the values');
 
@@ -373,9 +382,7 @@ if (!empty($master)) {
 
             return true;
         }
-</script>
 
-<script>
         //var baseurl = "<?php print base_url(); ?>";
         $(".editConfig").submit(function(e) {
             if (validate()) {
@@ -414,4 +421,5 @@ if (!empty($master)) {
             }
 
         }
+    });
 </script>

app/Views/expense_list.php

@@ -9,6 +9,11 @@
         padding-bottom: 0%;
     }
 
+    .expandable-td {
+        cursor: pointer;
+    }
+
+
     .Date-filter-form {
         display: flex;
         align-items: center;
@@ -86,15 +91,16 @@
                                 <table class="table table-bordered table-hover" id="expense_list_table" style="background-color:#fff;">
                                     <thead>
                                         <tr>
-                                            <th align="right">Created Date</th>
+                                            <th align="right" style="width: 10%;">Created Date</th>
                                             <!-- <th align="right">Expense Id</th> -->
-                                            <th align="right">Supplier Name</th>
+                                            <th align="right" style="width: 20%;">Supplier Name</th>
-                                            <th align="right">Cost</th>
+                                            <th align="right" style="width: 25%;">Item Description</th>
-                                            <th align="right">GST</th>
+                                            <th align="right" style="width: 7%;">Cost</th>
-                                            <th align="right">Total</th>
+                                            <th align="right" style="width: 5%;">CGST</th>
-                                            <th align="right">Payment Method</th>
+                                            <th align="right" style="width: 5%;">SGST</th>
-                                            <th align="right">Status</th>
+                                            <th align="right" style="width: 5%;">IGST</th>
-                                            <th>Action</th>
+                                            <th align="right" style="width: 7%;">Total</th>
+                                            <th align="right" style="width: 8%;">Action</th>
                                         </tr>
                                     </thead>
                                     <tbody>
@@ -118,12 +124,23 @@
                                                     ?>
                                                     <td><?php echo $cdate; ?></td>
                                                     <!-- <td><?php echo $record['id']; ?></td> -->
-                                                    <td><?php echo $record['SupplierName']; ?></td>
+                                                    <td class="expandable-td">
+                                                        <div class="text-container" style="max-height: 20px; overflow: hidden;">
+                                                            <?php echo $record['SupplierName']; ?>
+                                                        </div>
+                                                    </td>
+
+                                                    <!-- Item Description with Clickable TD for Expand/Collapse -->
+                                                    <td class="expandable-td">
+                                                        <div class="text-container" style="max-height: 20px; overflow: hidden;">
+                                                            <?php echo $record['item_description']; ?>
+                                                        </div>
+                                                    </td>
                                                     <td><?php echo $record['cost']; ?></td>
-                                                    <td><?php echo $record['gst']; ?></td>
+                                                    <td><?php echo $record['cgst']; ?></td>
+                                                    <td><?php echo $record['sgst']; ?></td>
+                                                    <td><?php echo $record['igst']; ?></td>
                                                     <td><?php echo $record['total']; ?></td>
-                                                    <td><?php echo $record['payment_method']; ?></td>
-                                                    <td><?php echo $record['status']; ?></td>
                                                     <td>
                                                         <?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;">
@@ -166,62 +183,82 @@
                 <form id="expenseForm" class="form-horizontal" role="form">
                     <input type="hidden" name="id" id="id">
                     <div class="form-group row">
+                        <div class="col-md-3">
+                            <label for="supplierid" class="col-form-label">Supplier </label>
+                        </div>
                         <div class="col-md-5">
+                            <select name="supplierid" id="supplierid" class="form-control" required>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <div class="col-md-3">
+                            <label for="supplierid" class="col-form-label">Item Description </label>
+                        </div>
+                        <div class="col-md-5">
+                            <textarea name="item_description" id="item_description" class="form-control"></textarea>
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <div class="col-md-3">
+                            <label for="cost" class="col-form-label">Cost</label>
+                        </div>
+                        <div class="col-md-5">
+                            <input type="number" name="cost" id="cost" class="form-control" onchange="totalCalculate()">
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <div class="col-md-3">
+                            <label for="cost" class="col-form-label">CGST</label>
+                        </div>
+                        <div class="col-md-5">
+                            <input type="number" name="cgst" id="cgst" class="form-control" onchange="totalCalculate()">
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <div class="col-md-3">
+                            <label for="cost" class="col-form-label">SGST</label>
+                        </div>
+                        <div class="col-md-5">
+                            <input type="number" name="sgst" id="sgst" class="form-control" onchange="totalCalculate()">
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <div class="col-md-3">
+                            <label for="igst" class="col-form-label">IGST</label>
+                        </div>
+                        <div class="col-md-5">
+                            <input type="number" name="igst" id="igst" class="form-control" onchange="totalCalculate()">
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <div class="col-md-3">
+                            <label for="cost" class="col-form-label">Total</label>
+                        </div>
+                        <div class="col-md-5">
+                            <input type="number" name="total" id="total" class="form-control">
+                        </div>
+                    </div>
+                    <div class="form-group row">
+                        <div class="col-md-3">
                             <label for="transporterfile" class="col-form-label">Transporter File</label>
+
+                        </div>
+                        <div class="col-md-5">
                             <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">
                                 Current file: <span id="currentFileName"></span>
                             </small>
                         </div>
-                        <div class="col-md-1">
-                        </div>
-                        <div class="col-md-5">
-                            <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="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="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">
+                        <div class="col-md-3">
-                            <label for="status" class="col-form-label">Status</label>
+                            <label for="note" class="col-form-label">Notes</label>
-                            <select name="status" id="status_id" class="form-control" required>
-                                <option>Select Status</option>
-                                <option value="Payment Pending">Payment Pending</option>
-                                <option value="Paid">Paid</option>
-                            </select>
-                        </div>
-                        <div class="col-md-1">
                         </div>
                         <div class="col-md-5">
-                            <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>
-                            </select>
-                        </div>
-                    </div>
-                    <div class="form-group row">
-                        <div class="col-md-12">
-                            <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>
                         </div>
-
                     </div>
                 </form>
             </div>
@@ -305,11 +342,13 @@
                     $('#currentFileName').text(''); // Clear the file name display
                     $('#supplierid').val(expense.supplier_id).trigger('change');
                     $('#remarks').val(expense.remarks);
+                    $('#item_description').val(expense.item_description);
                     $('#cost').val(expense.cost);
-                    $('#gst').val(expense.gst);
+                    $('#cgst').val(expense.cgst);
+                    $('#sgst').val(expense.sgst);
+                    $('#igst').val(expense.igst);
                     $('#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();
@@ -411,10 +450,8 @@
                 [10, 20, 30, 50, -1],
                 [10, 20, 30, 50, "All"]
             ],
-            responsive: true,
+            // responsive: true,
-            order: [
+            order: [],
-                [0, 'desc']
-            ],
             language: {
                 paginate: {
                     next: '<i class="fas fa-angle-right"></i>',
@@ -497,12 +534,34 @@
             }
         });
     });
-</script>
 
-
-<script>
     document.getElementById('transporterfile').addEventListener('change', function() {
         var fileName = this.files[0].name;
         document.getElementById('currentFileName').textContent = fileName;
     });
+
+    function totalCalculate() {
+        var cost = parseFloat($('#cost').val()) || 0;
+        var cgst = parseFloat($('#cgst').val()) || 0;
+        var sgst = parseFloat($('#sgst').val()) || 0;
+        var igst = parseFloat($('#igst').val()) || 0;
+
+        var total = cgst + sgst + igst + cost;
+        // var totalTaxAmount = (cost * totalTaxPercentage) / 100;
+        // var total = cost + totalTaxAmount;
+        $('#total').val(total.toFixed(2));
+    }
+
+    $(document).ready(function() {
+        $('.expandable-td').on('click', function() {
+            var $textContainer = $(this).find('.text-container');
+            if ($textContainer.css('max-height') === '20px') {
+                // Expand the content
+                $textContainer.css('max-height', 'none');
+            } else {
+                // Collapse the content
+                $textContainer.css('max-height', '20px');
+            }
+        });
+    });
 </script>

app/Views/includes/new_header.php

@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
-    <head>
+
+<head>
     <meta charset="utf-8" />
     <title><?php echo $pageTitle; ?></title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -75,55 +76,68 @@
             height: 5px;
             background-color: #f5f5f5;
         }
+
         ::-webkit-scrollbar-thumb {
             background-color: #797a7c;
             border-radius: 15px;
             height: 5px;
         }
+
         ::-webkit-scrollbar-track {
             background-color: #f5f5f5;
         }
 
         /* Select2  Input Hight Set */
-        .select2-selection.select2-selection--single{
+        .select2-selection.select2-selection--single {
             height: calc(1.5em + .9rem + 2px);
         }
+
         .select2-container--default .select2-selection--single .select2-selection__rendered {
             line-height: 37px;
         }
+
         .select2-container--default .select2-selection--single .select2-selection__arrow {
             top: 7px;
         }
+
         /* Select2 Height End */
-        .navbar-custom{
+        .navbar-custom {
             height: 55px;
         }
+
         .logo-box .logo {
             line-height: 55px;
         }
-        .navbar-custom .topnav-menu .nav-link{
+
+        .navbar-custom .topnav-menu .nav-link {
             max-height: 55px;
             line-height: 55px;
         }
+
         @media (min-width: 992px) {
             .topnav {
                 height: 45px;
                 margin-top: 55px;
             }
         }
-        .topnav .navbar-nav .nav-link{
+
+        .topnav .navbar-nav .nav-link {
             line-height: 15px;
         }
+
         .navbar-custom {
             background-color: #4f7c97 !important;
         }
+
         /* th{
             background-color: #ddd !important;
         } */
-        .btn.btn-secondary.buttons-html5 , .btn.btn-secondary.buttons-print{
+        .btn.btn-secondary.buttons-html5,
+        .btn.btn-secondary.buttons-print {
             border: 1px solid grey;
             border-radius: 4px !important;
         }
+
         legend {
             border-bottom: 2px solid #FFF !important;
             margin-left: -2%;
@@ -133,8 +147,10 @@
             color: red;
             background-color: #fff;
         }
+
         .btn-cancel {
-            background-color: grey; /* Red color */
+            background-color: grey;
+            /* Red color */
             color: white;
             padding: 10px 20px;
             text-align: center;
@@ -145,22 +161,25 @@
         }
 
         .btn-cancel:hover {
-            background-color: #02a8b5; /* Darker red on hover */
+            background-color: #02a8b5;
+            /* Darker red on hover */
             color: white;
         }
-</style>
+    </style>
 
     <style>
-        .date_range{
+        .date_range {
-            width:auto;
+            width: auto;
         }
-        .range_search_button{
+
+        .range_search_button {
             background-color: blue;
             color: #fff;
             width: 55px;
             border-radius: 5px;
         }
-        .range_reset_button{
+
+        .range_reset_button {
             background-color: red;
             color: #fff;
             width: 55px;
@@ -168,9 +187,11 @@
             padding: 8px;
             text-align: center;
         }
+
         .content-page {
             padding: 20px;
         }
+
         #loader_wrapper {
             display: none;
             position: fixed;
@@ -182,49 +203,60 @@
             z-index: 9999;
             text-align: center;
         }
+
         #loadingDiv {
             position: absolute;
             top: 50%;
             left: 50%;
             transform: translate(-50%, -50%);
         }
+
         .small-box {
             border-radius: 5px;
             padding: 20px;
             color: #fff;
             margin-bottom: 20px;
         }
+
         .bg-yellow {
             background-color: #f39c12;
         }
+
         .small-box .inner {
             padding: 10px;
         }
+
         .small-box .icon {
             font-size: 60px;
             line-height: 60px;
-            color: rgba(0,0,0,0.2);
+            color: rgba(0, 0, 0, 0.2);
         }
+
         .small-box-footer {
             display: block;
-            background: rgba(0,0,0,0.1);
+            background: rgba(0, 0, 0, 0.1);
             color: #fff;
             text-align: center;
             padding: 10px;
             text-decoration: none;
         }
+
         .btn-success {
             margin: 10px 0;
         }
     </style>
     <style>
-        .dataTables_wrapper .dataTables_paginate .paginate_button{
+        .dataTables_wrapper .dataTables_paginate .paginate_button {
             padding: .0em 0em !important;
         }
+
         .dataTables_wrapper .dataTables_paginate .paginate_button:hover {
-            color: black !important; /* Text color */
+            color: black !important;
-            border: 1px solid white; /* Light border color */
+            /* Text color */
-            background-color: white; /* White background */
+            border: 1px solid white;
+            /* Light border color */
+            background-color: white;
+            /* White background */
             background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, white), color-stop(100%, #f0f0f0));
             background: -webkit-linear-gradient(top, white 0%, #f0f0f0 100%);
             background: -moz-linear-gradient(top, white 0%, #f0f0f0 100%);
@@ -232,21 +264,26 @@
             background: -o-linear-gradient(top, white 0%, #f0f0f0 100%);
             background: linear-gradient(to bottom, white 0%, #f0f0f0 100%);
         }
-
     </style>
     <style>
         /* Style for DataTable buttons */
         .dt-buttons .btn {
-            background-color: white; /* White background for buttons */
+            background-color: white;
-            color: black; /* Black text color */
+            /* White background for buttons */
-            border: 1px solid white; /* Light gray border */
+            color: black;
-            padding: 5px 10px; /* Padding for buttons */
+            /* Black text color */
-            margin-right: 10px; /* Space between buttons */
+            border: 1px solid white;
+            /* Light gray border */
+            padding: 5px 10px;
+            /* Padding for buttons */
+            margin-right: 10px;
+            /* Space between buttons */
         }
 
         /* Space between buttons and length menu */
         .dataTables_length {
-            margin-left: 20px; /* Adjust this value for spacing */
+            margin-left: 20px;
+            /* Adjust this value for spacing */
         }
 
         /* Additional button hover styles */
@@ -255,14 +292,14 @@
             background-color: #d8eaf1;
             border-color: #cfe5ed;
         }
+
         div.dataTables_wrapper div.dataTables_length select {
             width: 87px !important;
             display: inline-block;
         }
     </style>
-<style>
+    <style>
-
+        .card_font_colorset_green {
-    .card_font_colorset_green{
             font-size: 23.7215px;
             font-weight: 500;
             line-height: 1.2;
@@ -270,7 +307,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;
@@ -278,7 +316,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;
@@ -286,12 +325,11 @@
             z-index: 1;
             color: rgb(173, 3, 23);
         }
+    </style>
 
-</style>
+</head>
 
-    </head>
+<body class="loading" data-layout-mode="horizontal" data-layout='{"mode": "light", "width": "fluid", "menuPosition": "fixed", "topbar": {"color": "dark"}, "showRightSidebarOnPageLoad": true}'>
-   
-    <body class="loading" data-layout-mode="horizontal" data-layout='{"mode": "light", "width": "fluid", "menuPosition": "fixed", "topbar": {"color": "dark"}, "showRightSidebarOnPageLoad": true}'>
 
     <!-- Begin page -->
     <div id="wrapper">
@@ -318,8 +356,10 @@
                         <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 ".$name." !"; ?><?php //echo $role; ?></h6>     
+                                <h6 class="text-overflow m-0"><?php echo "Welcome " . $name . " !"; ?><?php //echo $role; 
-                                    <!-- <h6 class="text-overflow m-0"><?php echo "Welcome ".$role_text." !"; ?><?php //echo $role; ?></h6>      -->
+                                                                                                        ?></h6>
+                                <!-- <h6 class="text-overflow m-0"><?php echo "Welcome " . $role_text . " !"; ?><?php //echo $role; 
+                                                                                                                ?></h6>      -->
                             </div>
 
                             <!-- item-->
@@ -400,8 +440,7 @@
                             <li class="nav-item dropdown">
                                 <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
+                                    <i class="ri-dashboard-line mr-1"></i>DASHBOARD</a>
-                                    </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> DASHBOARD <div class="arrow-down"></div>
@@ -519,19 +558,29 @@
                                             <i class="ri-list-settings-line align-middle mr-1"></i> Master Details <div class="arrow-down"></div>
                                         </a>
                                         <div class="dropdown-menu" aria-labelledby="topnav-master">
-                                                <a href="<?php echo base_url(); ?>supplierlisting" class="dropdown-item">Supplier Details</a>
+                                            <!-- <a href="<?php echo base_url(); ?>supplierlisting" class="dropdown-item">Supplier Details</a> -->
                                             <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">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>
+                                            <!-- <a href="<?php echo base_url(); ?>rawmaterialListing" class="dropdown-item">Material Details</a> -->
                                             <a href="<?php echo base_url(); ?>userListing" class="dropdown-item">Users</a>
                                         </div>
                                     </div>
                                 </div>
                             </li>
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>supplierlisting" role="button" aria-expanded="false">
+                                    <i class="fas fa-truck mr-1" style="color: gray;"></i>Supplier
+                                </a>
+                            </li>
+                            <li class="nav-item dropdown">
+                                <a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>rawmaterialListing" role="button" aria-expanded="false">
+                                    <i class="fas fa-cubes mr-1"></i>Material
+                                </a>
+                            </li>
 
                             <li class="nav-item dropdown">
                                 <a class="nav-link dropdown-toggle arrow-none" href="<?php echo base_url(); ?>reports" role="button"

app/Views/publicholidays.php

@@ -93,7 +93,7 @@
                 </table>
                 <p>&nbsp;</p>
                 <div class="row">
-                  <div class="col-md-4" id="savebutton">
+                  <div class="col-md-12 text-right" id="savebutton">
                     <input type="button" id="submit" value="Save" class="btn btn-success">
                   </div>
                 </div>