RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

Browse Source
This commit is contained in:
vadivelJ96 2025-04-01 08:44:18 +05:30
commit 98855fd909
30 changed files with 1449 additions and 1185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controllers/Emergencypurchaseorder.php
View File

@ -1276,7 +1276,7 @@ class Emergencypurchaseorder extends BaseController
} }
} }
} }
echo 'Purchase Order Created Successfully! PO Number Is: ' . $PONO; echo "Purchase Order Created Successfully! \n PO Number Is: " . $PONO;
} }
//This used to Edit the Revenue Purchase Order //This used to Edit the Revenue Purchase Order
function EditRevenuePurchaseOrder() function EditRevenuePurchaseOrder()
@ -1447,7 +1447,7 @@ class Emergencypurchaseorder extends BaseController
} }
} }
echo 'Purchase Order Updated Successfully! PO Number Is: ' . $PONO; echo "Purchase Order Updated Successfully! \n PO Number Is: " . $PONO;
} }

30
app/Controllers/Inwardgateregister.php
View File

@ -658,7 +658,8 @@ class Inwardgateregister extends BaseController
if ($fileupdated_count > 0) { if ($fileupdated_count > 0) {
$finalstatement .= "Number of files updated: $fileupdated_count \n"; $finalstatement .= "Number of files updated: $fileupdated_count \n";
$finalstatement .= "Files: \n" . implode(PHP_EOL, $fileupdated_name); // $finalstatement .= "Files: \n" . implode(PHP_EOL, $fileupdated_name);
$finalstatement .= "Files: \n" . implode(PHP_EOL, array_map(fn($file) => "• " . $file, $fileupdated_name));
} else { } else {
$finalstatement .= "No files to update"; $finalstatement .= "No files to update";
} }
@ -811,21 +812,23 @@ function viewIGRDetails()
$igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'TransporterId'=>$TransporterId,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'IGRStatus' => $IGRStatus,'UpdateBY' => $updateby,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanOrInvoiceNo,'Remark'=>$MasterRemarks); $igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'TransporterId'=>$TransporterId,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'IGRStatus' => $IGRStatus,'UpdateBY' => $updateby,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanOrInvoiceNo,'Remark'=>$MasterRemarks);
$MasterFile = $this->request->getfile('MasterFile'); $MasterFile = $this->request->getfile('MasterFile');
$fileupdated_count = 0;
$fileupdated_name = [];
if ($MasterFile) { if (!empty($MasterFile)) {
$requestMasterFileName = $MasterFile->getName(); $requestMasterFileName = $MasterFile->getName();
if ($MasterFile && $MasterFile->isValid() && !$MasterFile->hasMoved()) { if ($MasterFile && $MasterFile->isValid() && !$MasterFile->hasMoved()) {
if (!empty($this->inwardgateregister_model->isFileExistsInIGRmaster($requestMasterFileName))) { if (!empty($this->inwardgateregister_model->isFileExistsInIGRmaster($requestMasterFileName))) {
log_message('error', 'File already exists in the database'.$requestMasterFileName); log_message('error', 'File already exists in the database'.$requestMasterFileName);
} }
else{ else{
$MasterFile->move($path, $requestMasterFileName); $MasterFile->move($path, $requestMasterFileName);
$fileupdated_count++;
$fileupdated_name[] = $requestMasterFileName;
$igrarr['MasterFile'] = $requestMasterFileName; $igrarr['MasterFile'] = $requestMasterFileName;
} }
} }
} }
$fileupdated_count = 0;
$fileupdated_name = [];
$fileNames = $this->request->getPost('file_name'); $fileNames = $this->request->getPost('file_name');
$files = $this->request->getFileMultiple('emp_file'); $files = $this->request->getFileMultiple('emp_file');
@ -913,9 +916,16 @@ function viewIGRDetails()
} }
if ($getigrstatus == 'ST027' && ($updateigrmaster > 0 || $updateigrlineitem > 0)) { if ($getigrstatus == 'ST027' && ($updateigrmaster > 0 || $updateigrlineitem > 0)) {
if(session()->get('roleText') == 'System Administrator') // id is 1
$result_for_email = $this->inwardgateregister_model->getDetailsforEmail($this->session->get('userId')); {
$roleId = 2;
}
else if(session()->get('roleText') == 'Auditor') // id is 2
{
$roleId = 1;
}
$result_for_email = $this->inwardgateregister_model->getDetailsforEmail($this->session->get('userId'),$roleId);
$result_for_history = $this->inwardgateregister_model->getHistoryDetailsforEmail($IGRNo); $result_for_history = $this->inwardgateregister_model->getHistoryDetailsforEmail($IGRNo);
@ -982,6 +992,7 @@ function viewIGRDetails()
$email_response = $notification->sendEmail([ $email_response = $notification->sendEmail([
'recipient_email' => $email, 'recipient_email' => $email,
'subject' => $result_for_email['company'].' - IGR Notification', 'subject' => $result_for_email['company'].' - IGR Notification',
// 'carboncopy'=>Sales@resicoindustries.com,Factory@resicoindustries.com,Invoice@resicoindustries.com,
// 'description' => 'IGR Number : '.$IGRNo.' is Edited By '.($result_for_email['full_name'] ?? $this->session->get('name'))." On ".date('d-m-Y H:i A', strtotime(get_current_date_time() . ' +30 seconds')). $history_content, // 'description' => 'IGR Number : '.$IGRNo.' is Edited By '.($result_for_email['full_name'] ?? $this->session->get('name'))." On ".date('d-m-Y H:i A', strtotime(get_current_date_time() . ' +30 seconds')). $history_content,
'description' => $result_for_history['first_line']."<br>" .$history_content, 'description' => $result_for_history['first_line']."<br>" .$history_content,
'company' => $result_for_email['company'], 'company' => $result_for_email['company'],
@ -1016,7 +1027,8 @@ function viewIGRDetails()
if ($fileupdated_count > 0) { if ($fileupdated_count > 0) {
$finalstatement .= "Number of files updated: $fileupdated_count \n"; $finalstatement .= "Number of files updated: $fileupdated_count \n";
$finalstatement .= "Files: \n" . implode(PHP_EOL, $fileupdated_name); // $finalstatement .= "Files: \n" . implode(PHP_EOL, $fileupdated_name);
$finalstatement .= "Files: \n" . implode(PHP_EOL, array_map(fn($file) => "• " . $file, $fileupdated_name));
} else { } else {
$finalstatement .= "No files to update"; $finalstatement .= "No files to update";
} }

38
app/Controllers/Purchaseorder.php
View File

@ -1259,11 +1259,11 @@ class Purchaseorder extends BaseController
} }
} }
} }
$message = 'Revenue Purchase Order Created Successfully! PO Number Is: ' . $PONO; $message = "Revenue Purchase Order Created Successfully!\nPO Number Is: " . $PONO;
if($POStatus == 'ST014'){ if($POStatus == 'ST014'){
$message = 'Revenue Purchase Order Saved as Draft! PO Number Is: ' . $PONO; $message = "Revenue Purchase Order Saved as Draft!\nPO Number Is: " . $PONO;
} else if($POStatus == 'ST026'){ } else if($POStatus == 'ST026'){
$message = 'Revenue Purchase Order Approved Successfully! PO Number Is: ' . $PONO; $message = "Revenue Purchase Order Approved Successfully!\nPO Number Is: " . $PONO;
} }
echo $message; echo $message;
} catch (\Exception $e) { } catch (\Exception $e) {
@ -1596,11 +1596,11 @@ class Purchaseorder extends BaseController
} }
} }
$message = 'Revenue Purchase Order Updated Successfully! PO Number Is: ' . $PONO; $message = "Revenue Purchase Order Updated Successfully!\nPO Number Is: " . $PONO;
if($POStatus == 'ST014'){ if($POStatus == 'ST014'){
$message = 'Revenue Purchase Order Saved as Draft! PO Number Is: ' . $PONO; $message = "Revenue Purchase Order Saved as Draft!\nPO Number Is: " . $PONO;
} else if($POStatus == 'ST026'){ } else if($POStatus == 'ST026'){
$message = 'Revenue Purchase Order Approved Successfully! PO Number Is: ' . $PONO; $message = "Revenue Purchase Order Approved Successfully!\nPO Number Is: " . $PONO;
} }
echo $message; echo $message;
} }
@ -2163,11 +2163,11 @@ class Purchaseorder extends BaseController
} }
} }
$message = 'Import Purchase Order Created Successfully! PO Number Is: ' . $PONO; $message = "Import Purchase Order Created Successfully!\nPO Number Is: " . $PONO;
if($POStatus == 'ST014'){ if($POStatus == 'ST014'){
$message = 'Import Purchase Order Saved as Draft! PO Number Is: ' . $PONO; $message = "Import Purchase Order Saved as Draft!\nPO Number Is: " . $PONO;
} else if($POStatus == 'ST026'){ } else if($POStatus == 'ST026'){
$message = 'Import Purchase Order Approved Successfully! PO Number Is: ' . $PONO; $message = "Import Purchase Order Approved Successfully!\nPO Number Is: " . $PONO;
} }
echo $message; echo $message;
@ -2552,11 +2552,11 @@ class Purchaseorder extends BaseController
} }
$message = 'Import Purchase Order Updated Successfully! PO Number Is: ' . $PONO; $message = "Import Purchase Order Updated Successfully!\nPO Number Is: " . $PONO;
if($POStatus == 'ST014'){ if($POStatus == 'ST014'){
$message = 'Import Purchase Order Saved as Draft! PO Number Is: ' . $PONO; $message = "Import Purchase Order Saved as Draft!\nPO Number Is: " . $PONO;
} else if($POStatus == 'ST026'){ } else if($POStatus == 'ST026'){
$message = 'Import Purchase Order Approved Successfully! PO Number Is: ' . $PONO; $message = "Import Purchase Order Approved Successfully!\nPO Number Is: " . $PONO;
} }
echo $message; echo $message;
} }
@ -2937,11 +2937,11 @@ class Purchaseorder extends BaseController
} }
} }
$message = 'Capital Purchase Order Created Successfully! PO Number Is: ' . $PONO; $message = "Capital Purchase Order Created Successfully!\nPO Number Is: " . $PONO;
if($POStatus == 'ST014'){ if($POStatus == 'ST014'){
$message = 'Capital Purchase Order Saved as Draft! PO Number Is: ' . $PONO; $message = "Capital Purchase Order Saved as Draft!\nPO Number Is: " . $PONO;
} else if($POStatus == 'ST026'){ } else if($POStatus == 'ST026'){
$message = 'Capital Purchase Order Approved Successfully! PO Number Is: ' . $PONO; $message = "Capital Purchase Order Approved Successfully!\nPO Number Is: " . $PONO;
} }
echo $message; echo $message;
} catch (\Exception $e) { } catch (\Exception $e) {
@ -3373,11 +3373,11 @@ class Purchaseorder extends BaseController
} }
} }
} }
$message = 'Capital Purchase Order Updated Successfully! PO Number Is: ' . $PONO; $message = "Capital Purchase Order Updated Successfully!\nPO Number Is: " . $PONO;
if($POStatus == 'ST014'){ if($POStatus == 'ST014'){
$message = 'Capital Purchase Order Saved as Draft! PO Number Is: ' . $PONO; $message = "Capital Purchase Order Saved as Draft!\nPO Number Is: " . $PONO;
} else if($POStatus == 'ST026'){ } else if($POStatus == 'ST026'){
$message = 'Capital Purchase Order Approved Successfully! PO Number Is: ' . $PONO; $message = "Capital Purchase Order Approved Successfully!\nPO Number Is: " . $PONO;
} }
echo $message; echo $message;
@ -4563,7 +4563,7 @@ class Purchaseorder extends BaseController
$materialCode = $this->request->getPost('materialCode'); $materialCode = $this->request->getPost('materialCode');
$data = $this->PurchaseOrderLineItemModel->select('t_purchaseorder_lineitem.PONO,t_purchaseorder_master.TotalOrderValue,t_purchaseorder_master.CreatedDate,t_purchaseorder_master.POType,t_purchaseorder_master.CapitalRange,t_supplierdetailsn.SupplierName') $data = $this->PurchaseOrderLineItemModel->select('t_purchaseorder_lineitem.PONO,t_purchaseorder_master.TotalOrderValue,t_purchaseorder_master.CreatedDate,t_purchaseorder_master.POType,t_purchaseorder_master.CapitalRange,t_supplierdetailsn.SupplierName,t_purchaseorder_master.POType as ReqType')
->where('t_purchaseorder_lineitem.MaterialCode',$materialCode) ->where('t_purchaseorder_lineitem.MaterialCode',$materialCode)
->join('t_purchaseorder_master', 't_purchaseorder_lineitem.PONO = t_purchaseorder_master.PONO', 'left') ->join('t_purchaseorder_master', 't_purchaseorder_lineitem.PONO = t_purchaseorder_master.PONO', 'left')
->join('t_supplierdetailsn', 't_purchaseorder_master.SupplierID = t_supplierdetailsn.SupplierID', 'left') ->join('t_supplierdetailsn', 't_purchaseorder_master.SupplierID = t_supplierdetailsn.SupplierID', 'left')

9
app/Controllers/Report.php
View File

@ -984,14 +984,19 @@ class Report extends BaseController
if ($this->request->getMethod(true) === 'POST' && $this->request->getPost('btn_submit')) { if ($this->request->getMethod(true) === 'POST' && $this->request->getPost('btn_submit')) {
$cname = $this->request->getPost('client_name'); $cname = $this->request->getPost('client_name');
$data['client_name'] = $cname;
$prod = $this->request->getPost('item_name'); $prod = $this->request->getPost('item_name');
$data['item_name'] = $prod;
$frm = $this->request->getPost('from_date'); $frm = $this->request->getPost('from_date');
$data['from_date'] = $frm;
$t = $this->request->getPost('to_date'); $t = $this->request->getPost('to_date');
$data['to_date'] = $t;
$m = $this->request->getPost('month'); $m = $this->request->getPost('month');
$data['month'] = $m;
$purchaseorder_number = $this->request->getPost('purchaseorder_number'); $purchaseorder_number = $this->request->getPost('purchaseorder_number');
$data['purchaseorder_number'] = $purchaseorder_number;
$ab = $this->request->getPost('financialyear'); $ab = $this->request->getPost('financialyear');
$data['financialyear'] = $ab;
$fa = substr((string)$ab, 0, -5); $fa = substr((string)$ab, 0, -5);
$aa = substr((string)$ab, 5, 5); $aa = substr((string)$ab, 5, 5);

14
app/Controllers/Servicepurchaseorder.php
View File

@ -342,12 +342,12 @@ class Servicepurchaseorder extends BaseController
} }
} }
} }
$message = 'Service Purchase Order Created Successfully! PO Number Is: ' . $PONO; $message = "Service Purchase Order Created Successfully!\nPO Number Is: " . $PONO;
if($POStatus == 'ST014'){ if($POStatus == 'ST014'){
$message = 'Service Purchase Order Saved as Draft! PO Number Is: ' . $PONO; $message = "Service Purchase Order Saved as Draft!\nPO Number Is: " . $PONO;
} else if($POStatus == 'ST026'){ } else if($POStatus == 'ST026'){
$message = 'Service Purchase Order Approved Successfully! PO Number Is: ' . $PONO; $message = "Service Purchase Order Approved Successfully!\nPO Number Is: " . $PONO;
} }
echo $message; echo $message;
@ -614,13 +614,13 @@ class Servicepurchaseorder extends BaseController
} }
/*--------- Lineitem Section starts ---------------------*/ /*--------- Lineitem Section starts ---------------------*/
} }
$message = 'Service Purchase Order Updated Successfully! PO Number Is: ' . $PONO; $message = "Service Purchase Order Updated Successfully!\nPO Number Is: " . $PONO;
if($POStatus == 'ST014'){ if($POStatus == 'ST014'){
$message = 'Service Purchase Order Saved as Draft! PO Number Is: ' . $PONO; $message = "Service Purchase Order Saved as Draft!\nPO Number Is: " . $PONO;
} else if($POStatus == 'ST015'){ } else if($POStatus == 'ST015'){
$message = 'Service Purchase Order Created Successfully! PO Number Is: ' . $PONO; $message = "Service Purchase Order Created Successfully!\nPO Number Is: " . $PONO;
} else if($POStatus == 'ST026'){ } else if($POStatus == 'ST026'){
$message = 'Service Purchase Order Approved Successfully! PO Number Is: ' . $PONO; $message = "Service Purchase Order Approved Successfully!\nPO Number Is: " . $PONO;
} }
echo $message; echo $message;
} }

2
app/Models/Inwardgateregister_model.php
View File

@ -1300,7 +1300,7 @@ $builder = $this->db->table('t_igr_history')
]; ];
} }
public function getDetailsforEmail($userId,$roleId = 2) public function getDetailsforEmail($userId,$roleId)
{ {
$query0 = $this->db->query(" $query0 = $this->db->query("
SELECT CompanyName,EmailAddress SELECT CompanyName,EmailAddress

182
app/Views/EditservicePurchaseorder.php
View File

@ -52,6 +52,28 @@
.cancel-btn:hover { .cancel-btn:hover {
background-color: #f5c6cb; background-color: #f5c6cb;
} }
.btn-soft-primary {
color: white;
background-color: rgb(42, 206, 150);
border-color: rgb(42, 206, 150);
}
.btn-soft-primary:hover {
background-color: rgb(32, 176, 130); /* Slightly darker shade for hover */
border-color: rgb(32, 176, 130);
}
/* Container for the scrollable table */
.scrollable-table {
overflow: auto; /* Enable scrolling */
scrollbar-width: none; /* Hide scrollbar in Firefox */
-ms-overflow-style: none; /* Hide scrollbar in IE and Edge */
}
/* Hide scrollbar in WebKit browsers (Chrome, Safari, etc.) */
.scrollable-table::-webkit-scrollbar {
display: none; /* Hide scrollbar */
}
</style> </style>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
@ -1301,8 +1323,8 @@ if (!empty($getlogpodtl)) {
</td> </td>
<td style="text-align:left !important;"><?php echo $record->Quantity ?></td> <td style="text-align:left !important;"><?php echo $record->Quantity ?></td>
<td><?php echo $record->UOM ?></td> <td><?php echo $record->UOM ?></td>
<td style="text-align:right !important;"><?php echo $record->Rate ?></td> <td style="text-align:right !important;"><?php echo number_format($record->Rate, 2); ?></td>
<td style="text-align:right !important;"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td> <td style="text-align:right !important;"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
@ -1612,98 +1634,86 @@ if (!empty($getlogpodtl)) {
</table> </table>
</div> </div>
</div>--> <?php } else {} ?> </div>--> <?php } else {} ?>
<!-- ends here -->
<!-- f i l e c h o o s e n -->
<div class="form-row"> <div class="col-md-12">
<div class="form-group col-md-12 px-4"> <div class="row">
<div class="col-md-12">
<label>Select Purchase Order File</label><br> <label>Select Purchase Order File</label><br>
<input type="file" name="POFile" id="POFile"> <input type="file" name="POFile" id="POFile">
</div> </div>
<?php if ($PrePOFile) { ?> <?php if ($PrePOFile) { ?>
<div id="deletePreviousPurchaseOrderFileDiv"> <div class="col-md-12" id="deletePreviousPurchaseOrderFileDiv">
<div class="form-group col-md-12 px-4">
<label for="deletePreviousPurchaseOrderFile"><a title="Previous Upload PO File" <label for="deletePreviousPurchaseOrderFile"><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>Previous Upload - </span><small><?= $PrePOFile; ?></small></a></label> href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"><span>Previous Upload - </span><small><?= $PrePOFile; ?></small></a></label>
&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button> <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
</div>
</div> </div>
<?php } ?> <?php } ?>
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
</div>
</div> </div>
<!-- ends here --> <div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div>
<!-- /. f i l e c h o o s e n -->
<div class="form-group col-md-12 px-4"> <br/>
<!-- h i d d e n f i e l d s -->
<div class= "col-md-12">
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<div align="right"><br /> <input type="hidden" name="txtStatus" id="txtStatus" />
<div> <input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo isset($index) ? $index : ''; ?>">
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
</div> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" /> <input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
<input type="hidden" name="txtStatus" id="txtStatus" /> </div>
<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php if (isset($index)) { <!--/.h i d d e n f i e l d s -->
echo $index; <!-- f o o t e r b u t t o n -->
} ?>"> <div class="col-md-12">
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <div class="row">
<div class="col-md-5 text-left">
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" /> <label>Request On:</label> <?php echo isset($Reqon) ? $Reqon : ''; ?><br />
<?php if (!empty($RequesterName)) { ?>
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?> <label>Request By:</label> <?php echo $RequesterName; ?><br />
<a class="btn btn-secondary" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<?php if ($PONOStatus == PO_DRAFT) { ?>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save As Draft</span></a>
<?php } ?> <?php } ?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <label>Status:</label>
<a class="btn btn-success Save" ID="Save" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a> <?php
<?php } else if ($PONOStatus == SPECIAL_PO) { ?> $statusMappings = [
<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a> 'PO APPROVED' => 'AWAITING APPROVE',
<a class="btn btn-success Save" ID="Submit" onclick="Save(3)">&nbsp;&nbsp;<span class="bold">Submit</span></a> 'AWAITING RELEASE' => 'AWAITING APPROVE',
<?php } else { ?> 'RELEASER ONHOLD' => 'APPROVER ONHOLD',
<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a> 'PO RELEASED' => 'PO APPROVED',
<!-- <a class="btn btn-success Save" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a> --> ];
<?php } ?> echo isset($StatusName) && !empty($StatusName) ? ($statusMappings[$StatusName] ?? $StatusName) : "Status not provided";
?>
</div> </div>
</div>
<div class="form-group col-md-12 px-4">
<div align="left">
<label>Request On : </label><?php if (isset($Reqon)) {
echo $Reqon;
} ?><br />
<?php if (isset($RequesterName)) {
if ($RequesterName != '' || $RequesterName != null) { ?>
<label>Request By : </label><?php echo $RequesterName; ?><br />
<?php
}
} ?>
<!-- <label>Status : </label><?php echo $StatusName; ?> -->
<label>Status : </label><?php
$statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE',
'RELEASER ONHOLD' => 'APPROVER ONHOLD',
'PO RELEASED' => 'PO APPROVED',
];
if (isset($StatusName) && !empty($StatusName)) {
if (isset($statusMappings[$StatusName])) {
echo $statusMappings[$StatusName];
} else {
echo $StatusName;
}
} else {
echo "Status not provided";
}
?>
<div class="col-md-7 text-right">
<?php if ($PONOStatus == PO_DRAFT) { ?>
<a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if ($PONOStatus == PO_CREATED) { ?>
<a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<?php } else if($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else { ?>
<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
<?php } ?>
<!-- $PONOStatus == REQITEM_Emergency_PO_CREATED -->
</div>
</div> </div>
</div> </div>
<!--/. f o o t e r b u t t o n -->
</div> </div>
</div> <!-- end card body--> </div> <!-- end card body-->
@ -1948,7 +1958,7 @@ if (!empty($getlogpodtl)) {
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a> <a class="btn btn-secondary" data-dismiss="modal" value="Cancel" style="margin-right:10px;">Cancel</a>
<a class="btn btn-success font AddService" ID="AddService"><span class="bold">Add Service</span></a> <a class="btn btn-success font AddService" ID="AddService"><span class="bold">Add Service</span></a>
</div> </div>
</form> </form>
@ -2567,7 +2577,6 @@ if (!empty($getlogpodtl)) {
tinyMCE.triggerSave(); tinyMCE.triggerSave();
if (validateServiceTax()) { if (validateServiceTax()) {
// alert('inside Addservice');
var temp = parseInt(index) + 1; var temp = parseInt(index) + 1;
var Reqnumber = $('#ReqNo').val(); var Reqnumber = $('#ReqNo').val();
var departmentName = $('#deptName').val(); var departmentName = $('#deptName').val();
@ -2656,7 +2665,7 @@ if (!empty($getlogpodtl)) {
} else { } else {
rowHtml += `<td>-</td>`; rowHtml += `<td>-</td>`;
} }
rowHtml += `<td align="right">${quantity}</td> rowHtml += `<td align="left">${quantity}</td>
<td align="left">${uom}</td> <td align="left">${uom}</td>
<td align="right">${itemRate}</td> <td align="right">${itemRate}</td>
<td align="right">${basicval}</td> <td align="right">${basicval}</td>
@ -3478,7 +3487,9 @@ if (!empty($getlogpodtl)) {
$('#EditPer').val($('#per' + userid).val()); $('#EditPer').val($('#per' + userid).val());
$('#EditQuantity').val($('#quantity' + userid).val()); $('#EditQuantity').val($('#quantity' + userid).val());
RequistQuantity = $('#quantity' + userid).val(); RequistQuantity = $('#quantity' + userid).val();
$('#EditRate').val($('#itemRate' + userid).val()); RateValue = $('#itemRate' + userid).val();
RateValue = parseFloat(RateValue).toFixed(2)
$('#EditRate').val(RateValue);
$('#txtEditBasicValue').val(cellval[8].innerHTML); $('#txtEditBasicValue').val(cellval[8].innerHTML);
$('#EditCgst').val($('#Cgst' + userid).val()); $('#EditCgst').val($('#Cgst' + userid).val());
$('#EditSgst').val($('#Sgst' + userid).val()); $('#EditSgst').val($('#Sgst' + userid).val());
@ -3589,7 +3600,9 @@ if (!empty($getlogpodtl)) {
$('#ViewUOM').val($('#uom' + userid).val()); $('#ViewUOM').val($('#uom' + userid).val());
$('#ViewQuantity').val($('#quantity' + userid).val()); $('#ViewQuantity').val($('#quantity' + userid).val());
RequistQuantity = $('#quantity' + userid).val(); RequistQuantity = $('#quantity' + userid).val();
$('#ViewRate').val($('#itemRate' + userid).val()); RateValue = $('#itemRate' + userid).val();
RateValue = parseFloat(RateValue).toFixed(2)
$('#ViewRate').val(RateValue);
$('#txtViewBasicValue').val(cellval[8].innerHTML); $('#txtViewBasicValue').val(cellval[8].innerHTML);
$('#ViewCgst').val($('#Cgst' + userid).val()); $('#ViewCgst').val($('#Cgst' + userid).val());
$('#ViewSgst').val($('#Sgst' + userid).val()); $('#ViewSgst').val($('#Sgst' + userid).val());
@ -3878,4 +3891,5 @@ if (!empty($getlogpodtl)) {
} }
}); });
function Reset() { location.reload(); }
</script> </script>

37
app/Views/Report_pending_purchase.php
View File

@ -60,14 +60,6 @@
</div> </div>
</div> </div>
<?php if(isset($headline)) : if(!empty($headline)) : ?>
<div class="col-12">
<div class="page-title-right">
<span>Result filter by : </span><h4 class="page-title" style="display: inline;"><?php echo $headline; ?></h4>
</div>
</div>
<?php endif; endif; ?>
</div> </div>
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
@ -87,7 +79,7 @@
<option value="">Select Supplier</option> <option value="">Select Supplier</option>
<?php <?php
foreach ($cust as $item): { ?> foreach ($cust as $item): { ?>
<option value="<?php echo $item->SupplierName; ?>"><?php echo $item->SupplierName; ?></option> <option <?php if(isset($client_name) && ($client_name == $item->SupplierName)){ echo 'selected'; } ?> value="<?php echo $item->SupplierName; ?>"><?php echo $item->SupplierName; ?></option>
<?php } <?php }
endforeach; ?> endforeach; ?>
</select> </select>
@ -100,7 +92,7 @@
<option value="">Select Material</option> <option value="">Select Material</option>
<?php <?php
foreach ($material as $it): { ?> foreach ($material as $it): { ?>
<option value="<?php echo $it->MaterialName; ?>"><?php echo $it->MaterialName; ?></option> <option <?php if(isset($item_name) && ($item_name == $it->MaterialName)){ echo 'selected'; } ?> value="<?php echo $it->MaterialName; ?>"><?php echo $it->MaterialName; ?></option>
<?php } <?php }
endforeach; ?> endforeach; ?>
</select> </select>
@ -113,7 +105,7 @@
<option value="">Select Year</option> <option value="">Select Year</option>
<?php <?php
foreach ($finyear as $item): { ?> foreach ($finyear as $item): { ?>
<option value="<?php echo $item->financial_year; ?>"><?php echo $item->financial_year; ?></option> <option <?php if(isset($financialyear) && ($financialyear == $item->financial_year)){ echo 'selected'; } ?> value="<?php echo $item->financial_year; ?>"><?php echo $item->financial_year; ?></option>
<?php } <?php }
endforeach; ?> endforeach; ?>
</select> </select>
@ -125,18 +117,10 @@
<div class="input-group"> <div class="input-group">
<select class="form-control" id="month" name="month"> <select class="form-control" id="month" name="month">
<option value="">Select Month</option> <option value="">Select Month</option>
<option value="January">January</option> <?php $months = ["January", "February", "March", "April", "May", "June","July", "August", "September", "October", "November", "December"]; ?>
<option value="February">February</option> <?php foreach ($months as $m): { ?>
<option value="March">March</option> <option <?php if(isset($month) && ($month == $m)){ echo 'selected'; } ?> value="<?php echo $m; ?>"><?php echo $m; ?></option>
<option value="April">April</option> <?php } endforeach; ?>
<option value="May">May</option>
<option value="June">June</option>
<option value="July">July</option>
<option value="August">August</option>
<option value="September">September</option>
<option value="October">October</option>
<option value="November">November</option>
<option value="December">December</option>
</select> </select>
</div> </div>
</div> </div>
@ -147,8 +131,7 @@
<?php echo 'From Date'; ?> <?php echo 'From Date'; ?>
</label> </label>
<div class="input-group"> <div class="input-group">
<input name="from_date" id="max-date" class="form-control datepicker"> <input type="date" class="form-control" name="from_date" id="max-date" value="<?php if(isset($from_date)){ echo $from_date; } ?>">
</div> </div>
</div> </div>
<div class="col-2"> <div class="col-2">
@ -156,7 +139,7 @@
<?php echo 'To Date'; ?> <?php echo 'To Date'; ?>
</label> </label>
<div class="input-group"> <div class="input-group">
<input name="to_date" id="min-date" class="form-control datepicker"> <input type="date" class="form-control" name="to_date" id="min-date" value="<?php if(isset($to_date)){ echo $to_date; } ?>">
</div> </div>
</div> </div>
@ -168,7 +151,7 @@
<option value="">Select PO NO</option> <option value="">Select PO NO</option>
<?php <?php
foreach ($pono as $po): { ?> foreach ($pono as $po): { ?>
<option value="<?php echo $po->po; ?>"><?php echo $po->po.'-'.$po->type; ?></option> <option <?php if(isset($purchaseorder_number) && ($purchaseorder_number == $po->po)){ echo 'selected'; } ?> value="<?php echo $po->po; ?>"><?php echo $po->po.'-'.$po->type; ?></option>
<?php } <?php }
endforeach; ?> endforeach; ?>
</select> </select>

29
app/Views/alterpurchaseorder.php
View File

@ -149,6 +149,28 @@ if (!empty($INRSYMBOL)) {
.cancel-btn:hover { .cancel-btn:hover {
background-color: #f5c6cb; background-color: #f5c6cb;
} }
.btn-soft-primary {
color: white;
background-color: rgb(42, 206, 150);
border-color: rgb(42, 206, 150);
}
.btn-soft-primary:hover {
background-color: rgb(32, 176, 130); /* Slightly darker shade for hover */
border-color: rgb(32, 176, 130);
}
/* Container for the scrollable table */
.scrollable-table {
overflow: auto; /* Enable scrolling */
scrollbar-width: none; /* Hide scrollbar in Firefox */
-ms-overflow-style: none; /* Hide scrollbar in IE and Edge */
}
/* Hide scrollbar in WebKit browsers (Chrome, Safari, etc.) */
.scrollable-table::-webkit-scrollbar {
display: none; /* Hide scrollbar */
}
</style> </style>
<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script> <script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.js"></script>
<script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script> <script src="<?php echo base_url() ?>public/assets/lightswitch/lightswitch/lib/jquery.tabletojson.min.js"></script>
@ -6719,7 +6741,6 @@ if (!empty($INRSYMBOL)) {
$('.AddService').click(function () { $('.AddService').click(function () {
tinyMCE.triggerSave(); tinyMCE.triggerSave();
if (validateServiceTax()) { if (validateServiceTax()) {
// alert('inside Addservice');
var temp = index; var temp = index;
console.log('temp = ' + temp); console.log('temp = ' + temp);
var Reqnumber = $('#purpose').val(); var Reqnumber = $('#purpose').val();
@ -6939,7 +6960,8 @@ if (!empty($INRSYMBOL)) {
var isChecked = $('#IsOpenOrder').is(':checked'); var isChecked = $('#IsOpenOrder').is(':checked');
isChecked ? $('#ServiceQuantity').val(0).prop('readonly', true).prop('required', false) : $('#ServiceQuantity').val('').prop('readonly', false).prop('required', true); isChecked ? $('#ServiceQuantity').val(0).prop('readonly', true).prop('required', false) : $('#ServiceQuantity').val('').prop('readonly', false).prop('required', true);
$('#ServiceMaterialCode').val("0"); // $('#ServiceMaterialCode').val("0");
$('#ServiceMaterialCode').val("").select2();
$("#ServiceDescription").val(''); $("#ServiceDescription").val('');
$('#ServiceUOM').val(''); $('#ServiceUOM').val('');
$("#ServiceRate").val(''); $("#ServiceRate").val('');
@ -7003,6 +7025,7 @@ if (!empty($INRSYMBOL)) {
} }
$("#EditMaterialCode").empty(); $("#EditMaterialCode").empty();
// $('#EditMaterialCode').val("").select2();
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val())); $("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
if (typeof materialData !== 'undefined' && materialData !== null && materialData !== '') { if (typeof materialData !== 'undefined' && materialData !== null && materialData !== '') {
@ -7425,7 +7448,6 @@ if (!empty($INRSYMBOL)) {
} }
}); });
console.log("Data before AJAX call:", Object.fromEntries(formData)); console.log("Data before AJAX call:", Object.fromEntries(formData));
return;
// Perform form validation // Perform form validation
if (validate()) { if (validate()) {
@ -7741,7 +7763,6 @@ return;
tinyMCE.triggerSave(); tinyMCE.triggerSave();
if (validateEditRevenueTax()) { if (validateEditRevenueTax()) {
//alert('inside Add');
var CostCode = $("#EditRevenueCostCenter").val(); var CostCode = $("#EditRevenueCostCenter").val();
var AvilBudget = $('#EditRevenueAvlBudAmt').val(); var AvilBudget = $('#EditRevenueAvlBudAmt').val();
var editMaterialCode = $("#EditRevenueMaterialCode").val(); var editMaterialCode = $("#EditRevenueMaterialCode").val();

127
app/Views/capitalpurchaseorder.php
View File

@ -52,6 +52,18 @@
.cancel-btn:hover { .cancel-btn:hover {
background-color: #f5c6cb; background-color: #f5c6cb;
} }
/* Container for the scrollable table */
.scrollable-table {
overflow: auto; /* Enable scrolling */
scrollbar-width: none; /* Hide scrollbar in Firefox */
-ms-overflow-style: none; /* Hide scrollbar in IE and Edge */
}
/* Hide scrollbar in WebKit browsers (Chrome, Safari, etc.) */
.scrollable-table::-webkit-scrollbar {
display: none; /* Hide scrollbar */
}
</style> </style>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
@ -977,31 +989,39 @@ if (!empty($INRSYMBOL)) {
<br> <br>
<div class="form-row"> <!-- f i l e c h o o s e n -->
<div class="form-group"> <div class="col-md-12">
<label>Select Purchase Order File</label><br> <div class="row">
<input type="file" name="POFile" id="POFile"><br> <div class="col-md-12">
</div> <label>Select Purchase Order File</label><br>
</div><!-- form-row PO file --> <input type="file" name="POFile" id="POFile"><br>
</div>
</div>
</div>
<!-- /. f i l e c h o o s e n -->
<!-- h i d d e n f i e l d s -->
<div class= "col-md-12">
<input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="Budget" id="Budget" />
<!--<input type="hidden" name="CapitalToatlOrder" id="CapitalToatlOrder" /> -->
</div>
<!--/.h i d d e n f i e l d s -->
<!-- f o o t e r b u t t o n -->
<div class="col-md-12">
<div class="row">
<div class="col-md-12 text-right">
<a class="btn btn-danger Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div>
</div>
</div>
<!--/. f o o t e r b u t t o n -->
<div align="right" style="padding:1% 0%;">
<input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="Budget" id="Budget" />
<!--<input type="hidden" name="CapitalToatlOrder" id="CapitalToatlOrder" /> -->
<!-- <a class="btn btn-secondary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Cancel</span></a> -->
<a class="btn btn-secondary Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div><!-- hiden and button -->
<br /> <br />
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->
@ -1128,19 +1148,6 @@ if (!empty($INRSYMBOL)) {
</div><!-- /. first --> </div><!-- /. first -->
<div class="form-row">
<div class="form-group col-md-9"></div>
<div class="form-group col-md-3" id="hideModalExchange">
<label> Exchange Rate</label>
<?php
$data = array('name' => 'ExchangeRtModal', 'value' => set_value('ExchangeRtModal'), 'id' => 'ExchangeRtModal', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div><!-- /. 2nd -->
<div class="form-row" style="padding: 0px;"> <div class="form-row" style="padding: 0px;">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -1183,8 +1190,14 @@ if (!empty($INRSYMBOL)) {
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-3" id="DummyDiv"></div>
<div class="form-group col-md-3"></div> <div class="form-group col-md-3" id="hideModalExchange">
<label> Exchange Rate</label>
<?php
$data = array('name' => 'ExchangeRtModal', 'value' => set_value('ExchangeRtModal'), 'id' => 'ExchangeRtModal', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3" style="padding-right: 0px;"> <div class="form-group col-md-3" style="padding-right: 0px;">
<label id="RateIn">Rate(INR /UOM)</label><span class="text-danger">*</span> <label id="RateIn">Rate(INR /UOM)</label><span class="text-danger">*</span>
<?php <?php
@ -1599,7 +1612,7 @@ if (!empty($INRSYMBOL)) {
<br> <br>
<p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p> <p style="text-align:center; font-size: 16px; "><b>Product Cost / UOM</b></p>
<hr> <hr>
<br> <br>
@ -1737,21 +1750,6 @@ if (!empty($INRSYMBOL)) {
</div><!-- form-col-3 --> </div><!-- form-col-3 -->
</div><!--/.1st--> </div><!--/.1st-->
<div class="form-row">
<div class="form-group col-md-9"></div>
<div class="form-group col-md-3" id="hideModalExchangeEdit">
<label> Exchange Rate</label>
<div>
<?php
$data = array('name' => 'EditExchangeRtModal', 'value' => set_value('EditExchangeRtModal'), 'id' => 'EditExchangeRtModal', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div><!-- form-col-3 -->
</div><!--/.2nd -->
<div class="form-row" style="padding:0px;"> <div class="form-row" style="padding:0px;">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Item Code<span class="text-danger">*</span></label> <label>Item Code<span class="text-danger">*</span></label>
@ -1792,7 +1790,17 @@ if (!empty($INRSYMBOL)) {
</div><!--/.3rd--> </div><!--/.3rd-->
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-3"></div> <div class="form-group col-md-3" id="DummyEditDiv"></div>
<div class="form-group col-md-3" id="hideModalExchangeEdit">
<label> Exchange Rate</label>
<div>
<?php
$data = array('name' => 'EditExchangeRtModal', 'value' => set_value('EditExchangeRtModal'), 'id' => 'EditExchangeRtModal', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div><!-- form-col-3 -->
<div class="form-group col-md-3" style="padding-right: 0px;"> <div class="form-group col-md-3" style="padding-right: 0px;">
<label id="EditRateIn">Rate (In INR/UOM)</label><span class="text-danger">*</span> <label id="EditRateIn">Rate (In INR/UOM)</label><span class="text-danger">*</span>
<div> <div>
@ -2263,7 +2271,7 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<!--End of Adding of freight in edit model --> <!--End of Adding of freight in edit model -->
<br> <br>
<p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p> <p style="text-align:center; font-size: 16px; "><b>Product Cost / UOM</b></p>
<hr> <hr>
<br> <br>
<div class="form-row"> <div class="form-row">
@ -4504,6 +4512,7 @@ if (!empty($INRSYMBOL)) {
var formData = new FormData($('.CapitalPO')[0]); var formData = new FormData($('.CapitalPO')[0]);
formData.append('ExchangeRateOn', ExchangeRateOn); formData.append('ExchangeRateOn', ExchangeRateOn);
formData.append('PaymentMethod', PaymentMethod); formData.append('PaymentMethod', PaymentMethod);
// console.log("Data before AJAX call:", Object.fromEntries(formData));
$('#loader').show(); $('#loader').show();
// disableButtons(); // disableButtons();
$.ajax({ $.ajax({
@ -5277,6 +5286,8 @@ if (!empty($INRSYMBOL)) {
$('#EDITCAPdiv').hide(); $('#EDITCAPdiv').hide();
$('#datedomestic').hide(); $('#datedomestic').hide();
$('#dispatchinternational').show(); $('#dispatchinternational').show();
$('#DummyDiv').hide();
$('#DummyEditDiv').hide();
@ -5295,6 +5306,8 @@ if (!empty($INRSYMBOL)) {
$('#currencytype').val(''); $('#currencytype').val('');
$('#hideModalExchange').hide(); $('#hideModalExchange').hide();
$('#hideModalExchangeEdit').hide(); $('#hideModalExchangeEdit').hide();
$('#DummyDiv').show();
$('#DummyEditDiv').show();
$('#ExchangeRtModal').val('1'); $('#ExchangeRtModal').val('1');
$('#HideImportTaxTotal').hide(); $('#HideImportTaxTotal').hide();
$('#ModalImportTaxHide').hide(); $('#ModalImportTaxHide').hide();

194
app/Views/editCapitalAmendPO.php
View File

@ -4,7 +4,6 @@
align-items: center; align-items: center;
gap: 10px; gap: 10px;
} }
$CapitalRange
.edit-input-field { .edit-input-field {
padding: 2px; padding: 2px;
font-size: 14px; font-size: 14px;
@ -52,6 +51,30 @@
.cancel-btn:hover { .cancel-btn:hover {
background-color: #f5c6cb; background-color: #f5c6cb;
} }
.btn-soft-primary {
color: white;
background-color: rgb(42, 206, 150);
border-color: rgb(42, 206, 150);
}
.btn-soft-primary:hover {
background-color: rgb(32, 176, 130); /* Slightly darker shade for hover */
border-color: rgb(32, 176, 130);
}
/* Container for the scrollable table */
.scrollable-table {
overflow: auto; /* Enable scrolling */
scrollbar-width: none; /* Hide scrollbar in Firefox */
-ms-overflow-style: none; /* Hide scrollbar in IE and Edge */
}
/* Hide scrollbar in WebKit browsers (Chrome, Safari, etc.) */
.scrollable-table::-webkit-scrollbar {
display: none; /* Hide scrollbar */
}
</style> </style>
<?php <?php
$AvlCapitalBudAmt = isset($AvlCapitalBudAmt) ? (int) $AvlCapitalBudAmt : 0; $AvlCapitalBudAmt = isset($AvlCapitalBudAmt) ? (int) $AvlCapitalBudAmt : 0;
@ -386,6 +409,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
document.getElementById('currencyTypeDiv').style.display = 'none'; document.getElementById('currencyTypeDiv').style.display = 'none';
//document.getElementById('ExchangeRateModalDiv').style.display = 'none'; //document.getElementById('ExchangeRateModalDiv').style.display = 'none';
document.getElementById('ExchangeRateModalEditDiv').style.display = 'none'; document.getElementById('ExchangeRateModalEditDiv').style.display = 'none';
document.getElementById('DummyEditDiv').style.display = 'block';
document.getElementById('HideImportTaxTotal').style.display = 'none'; document.getElementById('HideImportTaxTotal').style.display = 'none';
// document.getElementById('ModalImportTaxHide').style.display = 'none'; // document.getElementById('ModalImportTaxHide').style.display = 'none';
document.getElementById('EditModalImportTaxHide').style.display = 'none'; document.getElementById('EditModalImportTaxHide').style.display = 'none';
@ -409,6 +433,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
document.getElementById('currencyTypeDiv').style.display = 'block'; document.getElementById('currencyTypeDiv').style.display = 'block';
//document.getElementById('ExchangeRateModalDiv').style.display = 'block'; //document.getElementById('ExchangeRateModalDiv').style.display = 'block';
document.getElementById('ExchangeRateModalEditDiv').style.display = 'block'; document.getElementById('ExchangeRateModalEditDiv').style.display = 'block';
document.getElementById('DummyEditDiv').style.display = 'none';
//document.getElementById('ExchangeRateModalViewDiv').style.display = 'block'; //document.getElementById('ExchangeRateModalViewDiv').style.display = 'block';
capitalType = 'International'; capitalType = 'International';
document.getElementById('currencyTypeDiv').style.display = 'block'; document.getElementById('currencyTypeDiv').style.display = 'block';
@ -1663,96 +1688,83 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
</div><!-- /.Special Instructions section --> </div><!-- /.Special Instructions section -->
<!-- Start po file changes as per edit page -->
<div class="form-row">
<div class="form-group col-md-12">
<label>Select Purchase Order File</label><br>
<input type="file" name="POFile" id="POFile">
</div>
</div>
<?php if (!empty($PrePOFile)) { <!-- f i l e c h o o s e n -->
$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile; <div class="col-md-12">
if (file_exists($PrePOFilePath)) { ?> <div class="row">
<div class="col-md-12">
<div class="form-row"> <label>Select Purchase Order File</label><br>
<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left"> <input type="file" name="POFile" id="POFile">
<br /> </div>
<?php if ($PrePOFile) {
<label><a title="Previous Upload PO File" $PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
if (file_exists($PrePOFilePath)) {
?>
<div class="col-md-12" id="deletePreviousPurchaseOrderFileDiv">
<label><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"> href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
<span>Previous Upload - </span> <span>Previous Upload - </span>
<small><?= $PrePOFile; ?></small></a></label> <small><?= $PrePOFile; ?></small></a></label>
&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete</button> <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
<input type="hidden" id="PrePOFile" name="PrePOFile" </div>
value="<?php echo $PrePOFile; ?>" /><br> <?php }} ?>
</div> <input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
</div>
</div> </div>
<div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div>
<?php } ?> <!-- /. f i l e c h o o s e n -->
<br/>
<?php } ?> <!-- h i d d e n f i e l d s -->
<!-- /.file section --> <div class= "col-md-12">
<!-- for button -->
<div class="form-row">
<div class="form-group col-md-12" align="right"><br>
<div class="btn-container" style="text-align: right;">
<input type="hidden" name="txtPoRange" id="txtPoRange" /> <input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" /> <input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
</div>
<!--/.h i d d e n f i e l d s -->
<!-- f o o t e r b u t t o n -->
<div class="col-md-12">
<div class="row">
<div class="col-md-5 text-left">
<?php $UpdatedOn = new DateTime($UpdatedOn, new DateTimeZone('Asia/Kolkata'));
$UpdatedOn = $UpdatedOn->format('d-m-Y'); ?>
<label>Request On :</label><?php echo $UpdatedOn; ?><br />
<?php if ($RequesterName != '' || $RequesterName != null) { ?>
<label>Request By : </label><?php echo $RequesterName; ?><br />
<?php } ?>
<!-- <label>Status :</label><?php echo $PoStatusName; ?> -->
<label>Status : </label><?php
$statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE',
'RELEASER ONHOLD' => 'APPROVER ONHOLD',
'PO RELEASED' => 'PO APPROVED',
];
if (isset($PoStatusName) && !empty($PoStatusName)) {
if (isset($statusMappings[$PoStatusName])) {
echo $statusMappings[$PoStatusName];
} else {
echo $PoStatusName;
}
} else {
echo "Status not provided";
}
?>
</div>
<input type="button" class="btn btn-secondary" value="Cancel" <div class="col-md-7 text-right">
onClick="window.location ='amendmentpurchaseorder';"> <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Save" onclick="Save(0)">&nbsp;&nbsp;<span <a class="btn btn-success" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
class="bold">Save as Draft</span></a> <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span </div>
class="bold">Approve</span></a> </div>
</div> </div>
<!--/. f o o t e r b u t t o n -->
</div>
</div>
<!-- /.button section -->
<div class="form-row">
<div class="form-group col-md-12">
<?php $UpdatedOn = new DateTime($UpdatedOn, new DateTimeZone('Asia/Kolkata'));
$UpdatedOn = $UpdatedOn->format('d-m-Y'); ?>
<label>Request On :</label><?php echo $UpdatedOn; ?><br />
<?php if ($RequesterName != '' || $RequesterName != null) { ?>
<label>Request By : </label><?php echo $RequesterName; ?><br />
<?php } ?>
<!-- <label>Status :</label><?php echo $PoStatusName; ?> -->
<label>Status : </label><?php
$statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE',
'RELEASER ONHOLD' => 'APPROVER ONHOLD',
'PO RELEASED' => 'PO APPROVED',
];
if (isset($PoStatusName) && !empty($PoStatusName)) {
if (isset($statusMappings[$PoStatusName])) {
echo $statusMappings[$PoStatusName];
} else {
echo $PoStatusName;
}
} else {
echo "Status not provided";
}
?>
<br />
</div>
</div>
<!-- /.Status details section -->
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->
@ -1875,16 +1887,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
<div class="form-row">
<div class="form-group col-md-9"></div>
<div class="form-group col-md-3" id="ExchangeRateModalEditDiv" style="display:none;">
<label> Exchange Rate</label>
<?php
$data = array('name' => 'EditExchangeRtModal', 'value' => set_value('EditExchangeRtModal'), 'id' => 'EditExchangeRtModal', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
</div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
@ -1921,7 +1924,15 @@ if (!empty($POItem) && $CapitalRange == '1') {
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-3"></div>
<div class="form-group col-md-3" id="DummyEditDiv"></div>
<div class="form-group col-md-3" id="ExchangeRateModalEditDiv">
<label> Exchange Rate</label>
<?php
$data = array('name' => 'EditExchangeRtModal', 'value' => set_value('EditExchangeRtModal'), 'id' => 'EditExchangeRtModal', 'class' => 'form-control num', 'readonly' => 'true');
echo form_input($data);
?>
</div>
<div class="form-group col-md-3" style="padding-right: 0px;"> <div class="form-group col-md-3" style="padding-right: 0px;">
<label id="EditRateIn">Rate(in INR/UOM)</label> <label id="EditRateIn">Rate(in INR/UOM)</label>
<?php <?php
@ -2342,7 +2353,7 @@ if (!empty($POItem) && $CapitalRange == '1') {
<!--End of Adding of freight in edit model --> <!--End of Adding of freight in edit model -->
<br> <br>
<p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p> <p style="text-align:center; font-size: 16px; "><b>Product Cost / UOM</b></p>
<hr> <hr>
<br> <br>
@ -5227,4 +5238,5 @@ Calculate Landing charge
$('#EditNett').val((basicnett).toFixed(2)); $('#EditNett').val((basicnett).toFixed(2));
} }
} }
function Reset() { location.reload(); }
</script> </script>

805
app/Views/editCapitalPo.php
View File

File diff suppressed because it is too large Load Diff

4
app/Views/editEmployeenew.php
View File

@ -442,11 +442,11 @@ if (!empty($EmpDetails)) {
</select> </select>
</div> </div>
<div class="col-md-4 pad"> <div class="col-md-4 pad" style="margin-top: 36px;">
<input type="checkbox" id="isactive" <?php echo $IsActive; ?> <input type="checkbox" id="isactive" <?php echo $IsActive; ?>
name="isactive" value="1" onchange="handleCheckboxChange()">&nbsp;&nbsp; name="isactive" value="1" onchange="handleCheckboxChange()">&nbsp;&nbsp;
<label style="margin-top:8px;"> <label>
Is Active Is Active
</label> </label>
</div> </div>

154
app/Views/editImportAmendPO.php
View File

@ -52,6 +52,29 @@
.cancel-btn:hover { .cancel-btn:hover {
background-color: #f5c6cb; background-color: #f5c6cb;
} }
.btn-soft-primary {
color: white;
background-color: rgb(42, 206, 150);
border-color: rgb(42, 206, 150);
}
.btn-soft-primary:hover {
background-color: rgb(32, 176, 130); /* Slightly darker shade for hover */
border-color: rgb(32, 176, 130);
}
/* Container for the scrollable table */
.scrollable-table {
overflow: auto; /* Enable scrolling */
scrollbar-width: none; /* Hide scrollbar in Firefox */
-ms-overflow-style: none; /* Hide scrollbar in IE and Edge */
}
/* Hide scrollbar in WebKit browsers (Chrome, Safari, etc.) */
.scrollable-table::-webkit-scrollbar {
display: none; /* Hide scrollbar */
}
</style> </style>
<?php <?php
$AvlAmount = 0; $AvlAmount = 0;
@ -1140,7 +1163,7 @@ if (!empty($RequistionDetails)) {
<!--End of Adding of freight in edit model --> <!--End of Adding of freight in edit model -->
<br> <br>
<p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p> <p style="text-align:center; font-size: 16px; "><b>Product Cost / UOM</b></p>
<hr> <hr>
<br> <br>
@ -1570,76 +1593,55 @@ if (!empty($RequistionDetails)) {
?> ?>
</div> </div>
</div> </div>
<!-- Start po file changes as per edit page -->
<div class="form-row">
<div class="form-group col-md-12">
<label>Select Purchase Order File</label><br>
<input type="file" name="POFile" id="POFile">
</div>
</div>
<?php if (!empty($PrePOFile)) { <!-- f i l e c h o o s e n -->
$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile; <div class="col-md-12">
if (file_exists($PrePOFilePath)) { ?> <div class="row">
<div class="col-md-12">
<div class="form-row"> <label>Select Purchase Order File</label><br>
<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left"> <input type="file" name="POFile" id="POFile">
<br /> </div>
<?php if ($PrePOFile) { ?>
<label><a title="Previous Upload PO File" <div class="col-md-12" id="deletePreviousPurchaseOrderFileDiv">
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"> <label><a title="Previous Upload PO File"
<span>Previous Upload - </span> href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
<small><?= $PrePOFile; ?></small></a></label> <span>Previous Upload - </span>
&nbsp;&nbsp;&nbsp;&nbsp; <small><?= $PrePOFile; ?></small></a></label>
<!-- <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete </button> --> &nbsp;&nbsp;&nbsp;&nbsp;
<!-- <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i> </button> -->
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /> </div>
</div> <?php } ?>
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
</div>
</div> </div>
<div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div>
<!-- /. f i l e c h o o s e n -->
<br/>
<!-- h i d d e n f i e l d s -->
<div class= "col-md-12">
<input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $Rowcount; ?>" />
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<input type="hidden" name="txtTotalorderValue" id="txtTotalorderValue" />
<?php } ?> <input type="hidden" name="beforePlaceOforigin" id="beforePlaceOforigin" value="<?php echo $Import_PlaceofOrgin; ?>" />
<input type="hidden" name="beforePaymentterms" id="beforePaymentterms" value="<?php echo $PaymentTerms; ?>" />
<!-- <input type="hidden" name="beforeschedule" id="beforeschedule" value="<?php echo $DeliverySchedule; ?>" />
<?php } ?> <input type="hidden" name="beforeDispatch" id="beforeschedule" value="<?php echo $Import_DispatchDetails; ?>" /> -->
<!-- ends here --> </div>
<!--/.h i d d e n f i e l d s -->
<div class="form-row"> <!-- f o o t e r b u t t o n -->
<div class="form-group col-md-12" align="right"><br /> <div class="col-md-12">
<div class="row">
<input type="hidden" name="txtPoRange" id="txtPoRange" /> <div class="col-md-5 text-left">
<input type="hidden" name="isEdit" id="isEdit" value="0" /> <label>Request On :</label><?php echo $Reqon; ?><br />
<input type="hidden" name="txtStatus" id="txtStatus" /> <label>Request By :</label><?php echo $RequesterName; ?><br />
<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $Rowcount; ?>" /> <!--<label>Status :</label><?php echo $StatusName; ?>-->
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" /> <label>Status : </label><?php
<input type="hidden" name="txtTotalorderValue" id="txtTotalorderValue" />
<input type="hidden" name="beforePlaceOforigin" id="beforePlaceOforigin" value="<?php echo $Import_PlaceofOrgin; ?>" />
<input type="hidden" name="beforePaymentterms" id="beforePaymentterms" value="<?php echo $PaymentTerms; ?>" />
<!-- <input type="hidden" name="beforeschedule" id="beforeschedule" value="<?php echo $DeliverySchedule; ?>" />
<input type="hidden" name="beforeDispatch" id="beforeschedule" value="<?php echo $Import_DispatchDetails; ?>" /> -->
<?php //if($PONOStatus == PO_DRAFT) {
?>
<!-- <a class="btn btn-success Save" ID="Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save</span></a> -->
<a class="btn btn-secondary Save" ID="Cancel" href="<?php echo base_url() . 'amendmentpurchaseorder'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a>
<a class="btn btn-success" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<!-- <input type="reset" class="btn btn-success" value="Reset"> -->
<?php //}else {
?>
<!-- <input type="reset" class="btn btn-success" value = "OK"> <?php //}
?>-->
<br />
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12">
<label>Request On :</label><?php echo $Reqon; ?><br />
<label>Request By :</label><?php echo $RequesterName; ?><br />
<!--<label>Status :</label><?php echo $StatusName; ?>-->
<label>Status : </label><?php
$statusMappings = [ $statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE', 'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE', 'AWAITING RELEASE' => 'AWAITING APPROVE',
@ -1657,13 +1659,18 @@ if (!empty($RequistionDetails)) {
echo "Status not provided"; echo "Status not provided";
} }
?> ?>
<br />
</div>
</div> <div class="col-md-7 text-right">
</div> <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<br />
</div>
</div>
</div>
<!--/. f o o t e r b u t t o n -->
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->
@ -3270,4 +3277,5 @@ if (!empty($RequistionDetails)) {
} }
function Reset() { location.reload(); }
</script> </script>

37
app/Views/editOldemppay.php
View File

@ -127,6 +127,16 @@ if (!empty($emppay)) {
.num { .num {
text-align: right; text-align: right;
} }
.btn-soft-primary {
color: white;
background-color: rgb(42, 206, 150);
border-color: rgb(42, 206, 150);
}
.btn-soft-primary:hover {
background-color: rgb(32, 176, 130); /* Slightly darker shade for hover */
border-color: rgb(32, 176, 130);
}
</style> </style>
<div class="content-page"> <div class="content-page">
@ -253,7 +263,12 @@ if (!empty($emppay)) {
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="form-group"> <div class="form-group">
<label class="d-block" for="request_letter">Request letter</label> <label class="d-block" for="request_letter">
Request letter
<!-- <?php if ($request_letter) { ?>
<a class="btn btn-soft-primary waves-effect waves-light btn-sm" title="Download Previous Upload - <?= $request_letter; ?>" href="<?php echo base_url() . 'public/uploads/images/' . $request_letter ?>"><i class="fa fa-download"></i></a>
<?php } ?> -->
</label>
<input type="file" accept=".docx,.pdf,.doc,.jpg,.png" id="request_letter" name="request_letter" style="margin-top: 5px;" /> <input type="file" accept=".docx,.pdf,.doc,.jpg,.png" id="request_letter" name="request_letter" style="margin-top: 5px;" />
<input type="hidden" id="hidden_request_letter" name="hidden_request_letter" value="<?php echo $request_letter; ?>" /> <input type="hidden" id="hidden_request_letter" name="hidden_request_letter" value="<?php echo $request_letter; ?>" />
</div> </div>
@ -271,17 +286,23 @@ if (!empty($emppay)) {
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="form-group"> <div class="form-group">
<label class="d-block" for="payment_statement">Payment Receipt</label> <label class="d-block" for="payment_statement">
Payment Receipt
<!-- <?php if ($payment_statement) { ?>
<a class="btn btn-soft-primary waves-effect waves-light btn-sm" title="Download Previous Upload - <?= $payment_statement; ?>" href="<?php echo base_url() . 'public/uploads/images/' . $payment_statement ?>"><i class="fa fa-download"></i></a>
<?php } ?> -->
</label>
<input type="file" accept=".docx,.pdf,.doc,.jpg,.png" id="payment_statement" name="payment_statement" style="margin-top: 5px;" /> <input type="file" accept=".docx,.pdf,.doc,.jpg,.png" id="payment_statement" name="payment_statement" style="margin-top: 5px;" />
<input type="hidden" id="hidden_payment_statement" name="hidden_payment_statement" value="<?php echo $payment_statement; ?>" /> <input type="hidden" id="hidden_payment_statement" name="hidden_payment_statement" value="<?php echo $payment_statement; ?>" />
</div> </div>
<?php if ($request_letter) { ?> <?php if ($payment_statement) { ?>
<span class="help-block"><small> <div class="mb-1">
<a href="<?php echo base_url() . 'public/uploads/images/' . $payment_statement ?>"> <a href="<?php echo base_url() . 'public/uploads/images/' . $payment_statement ?>">
<span>Previous Upload - </span><small><?= $payment_statement; ?></small> <span>Previous Upload - </span><small><?= $payment_statement; ?></small>
</a> </a>
</small></span> </div>
<br>
<?php } ?> <?php } ?>
</div> </div>
</div> <!-- 2nd row div closed here --> </div> <!-- 2nd row div closed here -->

179
app/Views/editRevenueAmendPO.php
View File

@ -52,6 +52,28 @@
.cancel-btn:hover { .cancel-btn:hover {
background-color: #f5c6cb; background-color: #f5c6cb;
} }
.btn-soft-primary {
color: white;
background-color: rgb(42, 206, 150);
border-color: rgb(42, 206, 150);
}
.btn-soft-primary:hover {
background-color: rgb(32, 176, 130); /* Slightly darker shade for hover */
border-color: rgb(32, 176, 130);
}
/* Container for the scrollable table */
.scrollable-table {
overflow: auto; /* Enable scrolling */
scrollbar-width: none; /* Hide scrollbar in Firefox */
-ms-overflow-style: none; /* Hide scrollbar in IE and Edge */
}
/* Hide scrollbar in WebKit browsers (Chrome, Safari, etc.) */
.scrollable-table::-webkit-scrollbar {
display: none; /* Hide scrollbar */
}
</style> </style>
<?php $ReqType = ''; <?php $ReqType = '';
$CompanyAddress = ''; $CompanyAddress = '';
@ -1318,7 +1340,7 @@ if (!empty($INRSYMBOL)) {
</td> </td>
<td class="text-right"><?php echo $record->Quantity ?></td> <td class="text-right"><?php echo $record->Quantity ?></td>
<td><?php echo $record->UOM ?></td> <td><?php echo $record->UOM ?></td>
<td class="text-right"><?php echo $record->Rate ?></td> <td class="text-right"><?php echo number_format($record->Rate, 2, '.', ''); ?></td>
<td class="text-right"> <td class="text-right">
<?php echo number_format($record->BasicValue, 2, '.', '') ?></td> <?php echo number_format($record->BasicValue, 2, '.', '') ?></td>
@ -1623,45 +1645,38 @@ if (!empty($INRSYMBOL)) {
</div> </div>
</div> </div>
<!-- Start po file changes as per edit page --> <!-- f i l e c h o o s e n -->
<div class="form-row"> <div class="col-md-12">
<div class="form-group col-md-12"> <div class="row">
<label>Select Purchase Order File</label><br> <div class="col-md-12">
<input type="file" name="POFile" id="POFile"> <label>Select Purchase Order File</label><br>
</div> <input type="file" name="POFile" id="POFile">
</div>
</div>
<?php if (!empty($PrePOFile)) {
$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
if (file_exists($PrePOFilePath)) {
?>
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
<div class="col-md-12" id="deletePreviousPurchaseOrderFileDiv">
<label><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
<span>Previous Upload - </span>
<small><?= $PrePOFile; ?></small></a></label>
&nbsp;&nbsp;&nbsp;&nbsp;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
<?php if (!empty($PrePOFile)) {
$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile; </div>
if (file_exists($PrePOFilePath)) { ?> <?php }} ?>
</div>
<div class="form-row">
<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
<br />
<label><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
<span>Previous Upload - </span>
<small><?= $PrePOFile; ?></small></a></label>
&nbsp;&nbsp;&nbsp;&nbsp;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete</button>
<input type="hidden" id="PrePOFile" name="PrePOFile"
value="<?php echo $PrePOFile; ?>" /><br>
</div>
</div> </div>
<div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div>
<?php } ?> <!-- /. f i l e c h o o s e n -->
<br/>
<?php } ?> <!-- h i d d e n f i e l d s -->
<!-- ends here --> <div class= "col-md-12">
<!-- for Button -->
<div class="form-row">
<div class="form-group col-md-12" align="right"><br />
<div class="btn-container" style="text-align: right;">
<input type="hidden" name="txtPoRange" id="txtPoRange" /> <input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" /> <input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
@ -1670,51 +1685,47 @@ if (!empty($INRSYMBOL)) {
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" /> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" /> <input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
<input type="button" class="btn btn-secondary" value="Cancel"
onClick="window.location ='amendmentpurchaseorder';">
<a class="btn btn-success Save" onclick="Save(0)">&nbsp;&nbsp;<span
class="bold">Save as Draft</span></a>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span
class="bold">Approve</span></a>
<!-- <input type="reset" class="btn btn-success" value = "OK"> -->
</div> </div>
</div> <!--/.h i d d e n f i e l d s -->
</div> <!-- f o o t e r b u t t o n -->
<!-- ends button --> <div class="col-md-12">
<div class="row">
<div class="col-md-5 text-left">
<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
$Reqon = $Reqon->format('d-m-Y'); ?>
<label>Request On :</label><?php echo $Reqon; ?><br>
<?php if ($RequesterName != '' || $RequesterName != null) { ?>
<label>Request By : </label><?php echo $RequesterName; ?><br />
<?php } ?>
<label>Status : </label><?php
$statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE',
'RELEASER ONHOLD' => 'APPROVER ONHOLD',
'PO RELEASED' => 'PO APPROVED',
];
<!-- for Status details --> if (isset($POStatus) && !empty($POStatus)) {
<div class="form-row"> if (isset($statusMappings[$POStatus])) {
<div class="form-group col-md-12"> echo $statusMappings[$POStatus];
<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata')); } else {
$Reqon = $Reqon->format('d-m-Y'); ?> echo $POStatus;
<label>Request On :</label><?php echo $Reqon; ?><br> }
<?php if ($RequesterName != '' || $RequesterName != null) { ?> } else {
<label>Request By : </label><?php echo $RequesterName; ?><br /> echo "Status not provided";
<?php } ?> }
<label>Status : </label><?php ?>
$statusMappings = [ </div>
'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE',
'RELEASER ONHOLD' => 'APPROVER ONHOLD',
'PO RELEASED' => 'PO APPROVED',
];
if (isset($POStatus) && !empty($POStatus)) { <div class="col-md-7 text-right">
if (isset($statusMappings[$POStatus])) { <a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
echo $statusMappings[$POStatus]; <a class="btn btn-success" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
} else { <a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
echo $POStatus; </div>
} </div>
} else {
echo "Status not provided";
}
?>
</div>
</div>
<!-- ends Status -->
</div>
<!--/. f o o t e r b u t t o n -->
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->
</div><!-- end col--> </div><!-- end col-->
@ -2343,8 +2354,8 @@ if (!empty($INRSYMBOL)) {
$('#EditQuantity').val($('#quantity' + userid).val()); $('#EditQuantity').val($('#quantity' + userid).val());
$('#EditAmendPer').val($('#per' + userid).val()); $('#EditAmendPer').val($('#per' + userid).val());
tinyMCE.get('Edit_Service_Description').setContent($('#service_description' + userid).val()); tinyMCE.get('Edit_Service_Description').setContent($('#service_description' + userid).val());
var EdititemRate = parseFloat($('#itemRate' + userid).val()).toFixed(2);
$('#EditRate').val($('#itemRate' + userid).val()); $('#EditRate').val(EdititemRate);
$('#txtEditBasicValue').val(parseFloat(cellval[7].innerHTML).toFixed(2)); $('#txtEditBasicValue').val(parseFloat(cellval[7].innerHTML).toFixed(2));
RequistQuantity = $('#quantity' + userid).val(); RequistQuantity = $('#quantity' + userid).val();
@ -2422,7 +2433,7 @@ if (!empty($INRSYMBOL)) {
var editDescription = $("#EditItemName").val(); var editDescription = $("#EditItemName").val();
var editUOM = $('#EditUOM').val(); var editUOM = $('#EditUOM').val();
var editQuantity = $('#EditQuantity').val(); var editQuantity = $('#EditQuantity').val();
var itemRate = $("#EditRate").val(); var itemRate = parseFloat($("#EditRate").val()).toFixed(2);
var per = $("#EditAmendPer").val(); var per = $("#EditAmendPer").val();
if (per == '') { if (per == '') {
per = $('#EditUOM').val(); per = $('#EditUOM').val();
@ -2478,7 +2489,7 @@ if (!empty($INRSYMBOL)) {
$('#materialName' + userid).val(editDescription); $('#materialName' + userid).val(editDescription);
$('#uom' + userid).val(editUOM); $('#uom' + userid).val(editUOM);
$('#quantity' + userid).val(editQuantity); $('#quantity' + userid).val(editQuantity);
$('#itemRate' + userid).val(itemRate); $('#itemRate' + userid).val(parseFloat(itemRate).toFixed(2));
$('#DisType' + userid).val(DisType); $('#DisType' + userid).val(DisType);
$('#DisVal' + userid).val(DisVal); $('#DisVal' + userid).val(DisVal);
$('#AfterDisVal' + userid).val(AfterDisVal); $('#AfterDisVal' + userid).val(AfterDisVal);
@ -2854,5 +2865,5 @@ if (!empty($INRSYMBOL)) {
$('#freightmodel').css('z-index', ''); // Reset to default $('#freightmodel').css('z-index', ''); // Reset to default
}); });
}); });
function Reset() { location.reload(); }
</script> </script>

211
app/Views/editRevenuepurchaseorder.php
View File

@ -51,6 +51,29 @@
.cancel-btn:hover { .cancel-btn:hover {
background-color: #f5c6cb; background-color: #f5c6cb;
} }
.btn-soft-primary {
color: white;
background-color: rgb(42, 206, 150);
border-color: rgb(42, 206, 150);
}
.btn-soft-primary:hover {
background-color: rgb(32, 176, 130); /* Slightly darker shade for hover */
border-color: rgb(32, 176, 130);
}
/* Container for the scrollable table */
.scrollable-table {
overflow: auto; /* Enable scrolling */
scrollbar-width: none; /* Hide scrollbar in Firefox */
-ms-overflow-style: none; /* Hide scrollbar in IE and Edge */
}
/* Hide scrollbar in WebKit browsers (Chrome, Safari, etc.) */
.scrollable-table::-webkit-scrollbar {
display: none; /* Hide scrollbar */
}
</style> </style>
<script> <script>
$(document).ready(function () { $(document).ready(function () {
@ -2898,115 +2921,100 @@ if (!empty($getlogpodtl)) {
<?php } else { <?php } else {
} ?> } ?>
<div class="form-row">
<div class="form-group col-md-12">
<label>Select Purchase Order File</label><br>
<input type="file" name="POFile" id="POFile">
</div>
</div>
<?php if (!empty($PrePOFile)) {
$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
if (file_exists($PrePOFilePath)) { ?>
<div class="form-row">
<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
<br />
<!-- f i l e c h o o s e n -->
<div class="col-md-12">
<div class="row">
<div class="col-md-12">
<label>Select Purchase Order File</label><br>
<input type="file" name="POFile" id="POFile">
</div>
<?php if ($PrePOFile) { ?>
<div class="col-md-12" id="deletePreviousPurchaseOrderFileDiv">
<label><a title="Previous Upload PO File" <label><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"> href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
<span>Previous Upload - </span> <span>Previous Upload - </span>
<small><?= $PrePOFile; ?></small></a></label> <small><?= $PrePOFile; ?></small></a></label>
&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete</button> <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
<input type="hidden" id="PrePOFile" name="PrePOFile" </div>
value="<?php echo $PrePOFile; ?>" /><br> <?php } ?>
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
</div>
</div>
<div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div>
<!-- /. f i l e c h o o s e n -->
<br/>
<!-- h i d d e n f i e l d s -->
<div class= "col-md-12">
<input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php if (isset($index)) {
echo $index;
} ?>">
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<input type="hidden" name="txttaxcheck" id="txttaxcheck" value="" />
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
</div>
<!--/.h i d d e n f i e l d s -->
<!-- f o o t e r b u t t o n -->
<div class="col-md-12">
<div class="row">
<div class="col-md-5 text-left">
<label>Request On : </label><?php echo $Reqon; ?><br />
<?php if ($RequesterName != '' || $RequesterName != null) { ?>
<label>Request By : </label><?php echo $RequesterName; ?><br />
<?php } ?>
<label>Status : </label><?php
$statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE',
'RELEASER ONHOLD' => 'APPROVER ONHOLD',
'PO RELEASED' => 'PO APPROVED',
];
if (isset($StatusName) && !empty($StatusName)) {
if (isset($statusMappings[$StatusName])) {
echo $statusMappings[$StatusName];
} else {
echo $StatusName;
}
} else {
echo "Status not provided";
}
?>
</div>
<div class="col-md-7 text-right">
<?php if ($PONOStatus == PO_DRAFT) { ?>
<a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if ($PONOStatus == PO_CREATED) { ?>
<a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
<a class="btn btn-success" ID="Viewsave" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<?php } else if($PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else { ?>
<a class="btn btn-success" ID="OK" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">OK</span></a>
<?php } ?>
<!-- $PONOStatus == REQITEM_Emergency_PO_CREATED -->
</div>
</div> </div>
</div> </div>
<!--/. f o o t e r b u t t o n -->
<?php } ?>
<?php } ?>
<div class="form-row">
<div class="form-group col-md-12" align="left"><br />
<div>
</div>
<input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php if (isset($index)) {
echo $index;
} ?>">
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<input type="hidden" name="txttaxcheck" id="txttaxcheck" value="" />
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
<div class="btn-container" style="text-align: right;">
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED) { ?>
<a class="btn btn-secondary Save" ID="Cancel"
href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span
class="bold">Cancel</span></a>
<?php if ($PONOStatus == PO_DRAFT) { ?>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span
class="bold">Save as Draft</span></a>
<?php } ?>
<a class="btn btn-success Save" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span
class="bold">Submit</span></a>
<a class="btn btn-success Save" ID="Submit"
onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
<a class="btn btn-success" ID="Viewsave" onclick="Save(2)">&nbsp;&nbsp;<span
class="bold">Submit</span></a>
<?php } else { ?>
<a class="btn btn-success" ID="OK"
href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span
class="bold">OK</span></a>
<?php } ?>
</div>
</div><br />
</div>
<div class="form-row">
<div class="form-group col-md-12">
<label>Request On : </label><?php echo $Reqon; ?><br />
<?php if ($RequesterName != '' || $RequesterName != null) { ?>
<label>Request By : </label><?php echo $RequesterName; ?><br />
<?php } ?>
<label>Status : </label><?php
$statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE',
'RELEASER ONHOLD' => 'APPROVER ONHOLD',
'PO RELEASED' => 'PO APPROVED',
];
if (isset($StatusName) && !empty($StatusName)) {
if (isset($statusMappings[$StatusName])) {
echo $statusMappings[$StatusName];
} else {
echo $StatusName;
}
} else {
echo "Status not provided";
}
?>
</div>
</div>
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->
@ -4611,7 +4619,6 @@ if (!empty($getlogpodtl)) {
tinyMCE.triggerSave(); tinyMCE.triggerSave();
if (validateEditRevenueTax() && validateEditExceedLimit() && ExceedEditQuantityCheck()) { if (validateEditRevenueTax() && validateEditExceedLimit() && ExceedEditQuantityCheck()) {
//alert('inside Add');
var CostCode = $("#EditCostCenter").val(); var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val(); var AvilBudget = $('#EditAvlBudAmt').val();
var editMaterialCode = $("#EditMaterialCode").val(); var editMaterialCode = $("#EditMaterialCode").val();
@ -6001,5 +6008,5 @@ if (!empty($getlogpodtl)) {
}); });
} }
function Reset() { location.reload(); }
</script> </script>

124
app/Views/editServiceAmendPO.php
View File

@ -52,6 +52,18 @@
.cancel-btn:hover { .cancel-btn:hover {
background-color: #f5c6cb; background-color: #f5c6cb;
} }
.btn-soft-primary {
color: white;
background-color: rgb(42, 206, 150);
border-color: rgb(42, 206, 150);
}
.btn-soft-primary:hover {
background-color: rgb(32, 176, 130); /* Slightly darker shade for hover */
border-color: rgb(32, 176, 130);
}
</style> </style>
<?php <?php
$insuranceStatus = array( $insuranceStatus = array(
@ -1147,7 +1159,7 @@ foreach ($PaymentTerms as $TER) {
</td> </td>
<td style="text-align:right !important"><?php echo $record->Quantity ?></td> <td style="text-align:right !important"><?php echo $record->Quantity ?></td>
<td><?php echo $record->UOM ?></td> <td><?php echo $record->UOM ?></td>
<td style="text-align:right !important"><?php echo $record->Rate ?></td> <td style="text-align:right !important"><?php echo number_format($record->Rate, 2); ?></td>
<td style="text-align:right !important"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td> <td style="text-align:right !important"><?php echo number_format($record->BasicValue * $FrequencyNo, 2, '.', ''); ?></td>
<td style="text-align:right !important"><?php echo $record->Taxamount ?></td> <td style="text-align:right !important"><?php echo $record->Taxamount ?></td>
<td style="text-align:right !important"><?php echo $record->TotalValue ?></td> <td style="text-align:right !important"><?php echo $record->TotalValue ?></td>
@ -1353,66 +1365,51 @@ foreach ($PaymentTerms as $TER) {
</div> </div>
<br> <br>
<!-- Start po file changes as per edit page --> <!-- ends here -->
<div class="form-row"> <!-- f i l e c h o o s e n -->
<div class="form-group col-md-12"> <div class="col-md-12">
<label>Select Purchase Order File</label><br> <div class="row">
<input type="file" name="POFile" id="POFile"> <div class="col-md-12">
</div> <label>Select Purchase Order File</label><br>
</div> <input type="file" name="POFile" id="POFile">
</div>
<?php if (!empty($PrePOFile)) { <?php if ($PrePOFile) {
$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile; $PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile;
if (file_exists($PrePOFilePath)) { ?> if (file_exists($PrePOFilePath)) {
?>
<div class="form-row"> <div class="col-md-12" id="deletePreviousPurchaseOrderFileDiv">
<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
<br />
<label><a title="Previous Upload PO File" <label><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"> href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
<span>Previous Upload - </span> <span>Previous Upload - </span>
<small><?= $PrePOFile; ?></small></a></label> <small><?= $PrePOFile; ?></small></a></label>
&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete</button> <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
</div>
<?php }} ?>
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br> <input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
</div> </div>
</div> </div>
<div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div>
<?php } ?> <!-- /. f i l e c h o o s e n -->
<br/>
<?php } ?> <!-- h i d d e n f i e l d s -->
<!-- ends here --> <div class= "col-md-12">
<!-- for Button -->
<div class="form-row">
<div class="form-group col-md-12" align="right"><br>
<div class="btn-container" style="text-align: right;">
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" /> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input class="btn btn-secondary" type="button" class="btn btn-success mr-2 " value="Cancel" onClick="window.location ='amendmentpurchaseorder';">
<a class="btn btn-success Save" onclick="Save(0)" >&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Save " ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
</div> </div>
</div> <!--/.h i d d e n f i e l d s -->
</div> <!-- f o o t e r b u t t o n -->
<!-- ends Button --> <div class="col-md-12">
<br> <div class="row">
<!-- for Start --> <div class="col-md-5 text-left">
<div class="form-row"> <?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata'));
$Reqon = $Reqon->format('d-m-Y'); ?>
<div class="form-group col-md-3"> <label>Request On :</label><?php echo $Reqon; ?><br />
<?php $Reqon = new DateTime($Reqon, new DateTimeZone('Asia/Kolkata')); <label>Request By :</label><?php echo $RequesterName; ?><br />
$Reqon = $Reqon->format('d-m-Y'); ?> <label>Status : </label><?php
<label>Request On :</label><?php echo $Reqon; ?><br />
<label>Request By :</label><?php echo $RequesterName; ?><br />
<label>Status : </label><?php
$statusMappings = [ $statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE', 'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE', 'AWAITING RELEASE' => 'AWAITING APPROVE',
@ -1430,13 +1427,17 @@ foreach ($PaymentTerms as $TER) {
echo "Status not provided"; echo "Status not provided";
} }
?> ?>
</div>
<div class="col-md-7 text-right">
<a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
</div>
</div>
</div> </div>
<!--/. f o o t e r b u t t o n -->
</div>
<!-- ends Button -->
</div> </div>
</div> </div>
</div> </div>
@ -1738,7 +1739,7 @@ foreach ($PaymentTerms as $TER) {
</div> </div>
<div class="form-row px-3"> <div class="form-row px-3">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label>Service Description </label> <label>Service Description <span class="text-danger">*</span></label>
<?php $data = array( <?php $data = array(
'name' => 'EdittxtSpcialInstruction', 'name' => 'EdittxtSpcialInstruction',
'value' => set_value('EdittxtSpcialInstruction', $ServiceMaterialDescription), 'value' => set_value('EdittxtSpcialInstruction', $ServiceMaterialDescription),
@ -1883,7 +1884,9 @@ foreach ($PaymentTerms as $TER) {
$('#EditAmendPer').val($('#per' + userid).val()); $('#EditAmendPer').val($('#per' + userid).val());
$('#EditQuantity').val($('#quantity' + userid).val()); $('#EditQuantity').val($('#quantity' + userid).val());
RequistQuantity = $('#quantity' + userid).val(); RequistQuantity = $('#quantity' + userid).val();
$('#EditRate').val($('#itemRate' + userid).val()); RateValue = $('#itemRate' + userid).val();
RateValue = parseFloat(RateValue).toFixed(2);
$('#EditRate').val(RateValue);
$('#txtEditBasicValue').val(cellval[8].innerHTML); $('#txtEditBasicValue').val(cellval[8].innerHTML);
$('#EditCgst').val($('#Cgst' + userid).val()); $('#EditCgst').val($('#Cgst' + userid).val());
$('#EditSgst').val($('#Sgst' + userid).val()); $('#EditSgst').val($('#Sgst' + userid).val());
@ -2330,6 +2333,10 @@ foreach ($PaymentTerms as $TER) {
else if (ExceedBudget($('#txtEditBasicValue').val(), $('#EditAvlBudAmt').val()) == false) { else if (ExceedBudget($('#txtEditBasicValue').val(), $('#EditAvlBudAmt').val()) == false) {
$('#EditRate').focus(); $('#EditRate').focus();
return false; return false;
} else if ($('#EdittxtSpcialInstruction').val() == '') {
alert('Please Enter the Service Description');
$('#EdittxtSpcialInstruction').focus();
return false;
} else { } else {
return true; return true;
} }
@ -2493,6 +2500,7 @@ foreach ($PaymentTerms as $TER) {
return TAXval; // $('#AfterServiceTax').val(TAXval); return TAXval; // $('#AfterServiceTax').val(TAXval);
} }
function Reset() { location.reload(); }
$(document).ready(function () { $(document).ready(function () {
$("#PaymentTerms").change(function() { $("#PaymentTerms").change(function() {
if ($('#PaymentTerms').val().trim() == 'PT08') { if ($('#PaymentTerms').val().trim() == 'PT08') {

159
app/Views/editimportpo.php
View File

@ -52,6 +52,29 @@
.cancel-btn:hover { .cancel-btn:hover {
background-color: #f5c6cb; background-color: #f5c6cb;
} }
.btn-soft-primary {
color: white;
background-color: rgb(42, 206, 150);
border-color: rgb(42, 206, 150);
}
.btn-soft-primary:hover {
background-color: rgb(32, 176, 130); /* Slightly darker shade for hover */
border-color: rgb(32, 176, 130);
}
/* Container for the scrollable table */
.scrollable-table {
overflow: auto; /* Enable scrolling */
scrollbar-width: none; /* Hide scrollbar in Firefox */
-ms-overflow-style: none; /* Hide scrollbar in IE and Edge */
}
/* Hide scrollbar in WebKit browsers (Chrome, Safari, etc.) */
.scrollable-table::-webkit-scrollbar {
display: none; /* Hide scrollbar */
}
</style> </style>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
@ -1297,46 +1320,33 @@ if (!empty($getlogpodtl)) {
</div> <!-- ends box-body --> </div> <!-- ends box-body -->
<div class="form-row px-1"> <!-- f i l e c h o o s e n -->
<label>Select Purchase Order File</label> <div class="col-md-12">
<div class="form-group col-md-12" align="left"> <div class="row">
<input type="file" class="" name="POFile" id="POFile"> <div class="col-md-12">
</div> <label>Select Purchase Order File</label><br>
<input type="file" class="" name="POFile" id="POFile">
</div> </div>
<?php if ($PrePOFile) { ?>
<?php if (!empty($PrePOFile)) { <div class="col-md-12" id="deletePreviousPurchaseOrderFileDiv">
$PrePOFilePath = FCPATH . 'public/uploads/POfiles/' . $PrePOFile; <label><a title="Previous Upload PO File"
if (file_exists($PrePOFilePath)) { ?>
<div class="form-row">
<div class="form-group col-md-12" id="deletePreviousPurchaseOrderFileDiv" align="left">
<br />
<label><a title="Previous Upload PO File"
href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>"> href="<?php echo base_url() . 'public/uploads/POfiles/' . $PrePOFile ?>">
<span>Previous Upload - </span> <span>Previous Upload - </span>
<small><?= $PrePOFile; ?></small></a></label> <small><?= $PrePOFile; ?></small></a></label>
&nbsp;&nbsp;&nbsp;&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;
<button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile">Delete</button> <button class="btn btn-danger btn-sm " id="deletePreviousPurchaseOrderFile"><i class="mdi mdi-close"></i></button>
</div>
<input type="hidden" id="PrePOFile" name="PrePOFile" <?php } ?>
value="<?php echo $PrePOFile; ?>" /><br> <input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
</div> </div>
</div> </div>
<div class="px-6">&nbsp;&nbsp;&nbsp;&nbsp;</div>
<?php } ?> <!-- /. f i l e c h o o s e n -->
<br/>
<?php } ?> <!-- h i d d e n f i e l d s -->
<div class= "col-md-12">
<div class="form-row px-4 "> <input type="hidden" name="txtPoRange" id="txtPoRange" />
<div class="form-group col-md-12">
<div align="right">
<input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" /> <input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
<!-- <input type="hidden" name="txtRowCount" id="txtRowCount" /> --> <!-- <input type="hidden" name="txtRowCount" id="txtRowCount" /> -->
@ -1345,39 +1355,15 @@ if (!empty($getlogpodtl)) {
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" /> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" /> <input type="hidden" name="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
</div>
<a class="btn btn-secondary Save" ID="Cancel" href="<?php echo base_url() . 'purchaseorderListing'; ?>">&nbsp;&nbsp;<span class="bold">Cancel</span></a> <!--/.h i d d e n f i e l d s -->
<?php if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED) { <!-- f o o t e r b u t t o n -->
if ($PONOStatus == PO_DRAFT) { ?> <div class="col-md-12">
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a> <div class="row">
<?php } ?> <div class="col-md-5 text-left">
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <label>Request On :</label><?php echo $Reqon; ?><br />
<a class="btn btn-success waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a> <label>Request By :</label><?php echo $RequesterName; ?><br />
<?php } else if($PONOStatus == PO_AMENDED){ ?> <label>Status : </label><?php
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
<?php } else { ?>
<?php if ($DEPCode == FINANCE) { ?>
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
<?php } else { ?>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(2)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<a class="btn btn-success" href="<?php echo base_url(); ?>purchaseorderListing">OK</a>
<?php } ?>
<?php } ?>
</div>
</div>
</div>
<div class="form-row px-1 ">
<div class="form-group col-md-12" align="left">
<label>Request On :</label><?php echo $Reqon; ?><br />
<label>Request By :</label><?php echo $RequesterName; ?><br />
<label>Status : </label><?php
$statusMappings = [ $statusMappings = [
'PO APPROVED' => 'AWAITING APPROVE', 'PO APPROVED' => 'AWAITING APPROVE',
'AWAITING RELEASE' => 'AWAITING APPROVE', 'AWAITING RELEASE' => 'AWAITING APPROVE',
@ -1396,13 +1382,29 @@ if (!empty($getlogpodtl)) {
} }
?> ?>
<br /> <br />
</div> </div>
</div>
<div class="col-md-7 text-right">
<?php if ($PONOStatus == PO_DRAFT) { ?>
<a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if ($PONOStatus == PO_CREATED) { ?>
<a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<a class="btn btn-soft-primary waves-effect waves-light Submit" ID="Submit" onclick="Save(4)">&nbsp;&nbsp;<span class="bold">Approve</span></a>
<?php } else if ($PONOStatus == SPECIAL_PO) { ?>
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
<?php } else { ?>
<a class="btn btn-success" ID="OK" onclick="PageRedirect()">OK</a>
<?php } ?>
</div>
</div>
</div>
<!--/. f o o t e r b u t t o n -->
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->
@ -1900,7 +1902,7 @@ if (!empty($getlogpodtl)) {
<!--End of Adding of freight in edit model --> <!--End of Adding of freight in edit model -->
<br> <br>
<p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p> <p style="text-align:center; font-size: 16px; "><b>Product Cost / UOM</b></p>
<hr> <hr>
<br> <br>
@ -2477,7 +2479,7 @@ if (!empty($getlogpodtl)) {
<br> <br>
<center> <label>Cost of the product Per UOM</label></center> <center> <label>Product Cost / UOM</label></center>
<hr /> <hr />
<div class="form-row"> <div class="form-row">
@ -2939,7 +2941,7 @@ if (!empty($getlogpodtl)) {
<br> <br>
<center> <label>Cost of the product Per KG</label></center> <center> <label>Product Cost / UOM</label></center>
<hr /> <hr />
<!--End of Adding of freight in edit model --> <!--End of Adding of freight in edit model -->
@ -5904,4 +5906,5 @@ if (!empty($getlogpodtl)) {
} }
} }
function Reset() { location.reload(); }
</script> </script>

13
app/Views/editrequisitionform.php
View File

@ -48,6 +48,17 @@ if (!empty($ReqPOType)) {
background-color: rgb(32, 176, 130); /* Slightly darker shade for hover */ background-color: rgb(32, 176, 130); /* Slightly darker shade for hover */
border-color: rgb(32, 176, 130); border-color: rgb(32, 176, 130);
} }
/* Container for the scrollable table */
.scrollable-table {
overflow: auto; /* Enable scrolling */
scrollbar-width: none; /* Hide scrollbar in Firefox */
-ms-overflow-style: none; /* Hide scrollbar in IE and Edge */
}
/* Hide scrollbar in WebKit browsers (Chrome, Safari, etc.) */
.scrollable-table::-webkit-scrollbar {
display: none; /* Hide scrollbar */
}
.th{ .th{
font-size: 14px; font-size: 14px;
@ -198,7 +209,7 @@ td {
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
<div class="table-responsive"> <div class="table-responsive scrollable-table">
<table id="Items" class="table table-striped table-hover mb-0" style="font-size:12px;"> <table id="Items" class="table table-striped table-hover mb-0" style="font-size:12px;">
<thead> <thead>
<tr> <tr>

88
app/Views/importpo.php
View File

@ -128,6 +128,18 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
.cancel-btn:hover { .cancel-btn:hover {
background-color: #f5c6cb; background-color: #f5c6cb;
} }
/* Container for the scrollable table */
.scrollable-table {
overflow: auto; /* Enable scrolling */
scrollbar-width: none; /* Hide scrollbar in Firefox */
-ms-overflow-style: none; /* Hide scrollbar in IE and Edge */
}
/* Hide scrollbar in WebKit browsers (Chrome, Safari, etc.) */
.scrollable-table::-webkit-scrollbar {
display: none; /* Hide scrollbar */
}
</style> </style>
<script src="<?php echo base_url() ?>public/assets/tinymce/js/tinymce/tinymce.min.js"></script> <script src="<?php echo base_url() ?>public/assets/tinymce/js/tinymce/tinymce.min.js"></script>
<script src="<?php echo base_url(); ?>public/assets/js/CreatePOValidation.js" type="text/javascript"></script> <script src="<?php echo base_url(); ?>public/assets/js/CreatePOValidation.js" type="text/javascript"></script>
@ -965,49 +977,37 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div> </div>
<!-- f i l e c h o o s e n -->
<div class="col-md-12">
<div class="row">
<div class="form-row"> <div class="col-md-12">
<div class="form-group col-md-12"> <label>Select Purchase Order File</label><br>
<label> <input type="file" name="POFile" id="POFile"><br>
Select Purchase Order File </div>
</label> </div>
<br>
<input type="file" name="POFile" id="POFile"><br>
</div>
</div>
<br><br>
<div class="form-row">
<div class="form-group col-md-12" align="right">
<input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="Budget" id="Budget" />
<div class="btn-container" style="text-align: right;">
<!-- <a class="btn btn-success Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a> -->
<!-- <input type="reset" class="btn btn-success" value="Reset" onclick="window.location.reload()"> -->
<a class="btn btn-secondary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div> </div>
<!-- /. f i l e c h o o s e n -->
</div> <!-- h i d d e n f i e l d s -->
<div class= "col-md-12">
</div> <input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="Budget" id="Budget" />
</div>
<!--/.h i d d e n f i e l d s -->
<!-- f o o t e r b u t t o n -->
<div class="col-md-12">
<div class="row">
<div class="col-md-12 text-right">
<a class="btn btn-danger Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div>
</div>
</div>
<!--/. f o o t e r b u t t o n -->
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->
</div><!-- end col--> </div><!-- end col-->
@ -1477,7 +1477,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div> </div>
<br> <br>
<p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p> <p style="text-align:center; font-size: 16px; "><b>Product Cost / UOM</b></p>
<hr> <hr>
<br> <br>
@ -2047,7 +2047,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<br> <br>
<p style="text-align:center; font-size: 16px; "><b>Cost Of The Product Per UOM</b></p> <p style="text-align:center; font-size: 16px; "><b>Product Cost / UOM</b></p>
<hr> <hr>
<br> <br>

5
app/Views/includes/new_footer.php
View File

@ -161,8 +161,8 @@
var PONO = $('#txtPONO').val(); var PONO = $('#txtPONO').val();
let confirmTrue=confirm(`Do you confirm to delete the Purchase order file for the PONO ${PONO} ?`); // let confirmTrue=confirm(`Do you confirm to delete the Purchase order file for the PONO ${PONO} ?`);
let confirmTrue=confirm(`Are you sure you want to delete the Purchase Order file for PONO ${PONO} ?`);
if(confirmTrue){ if(confirmTrue){
@ -185,6 +185,7 @@
if (response) if (response)
alert(response.success); alert(response.success);
location.reload();
} }

6
app/Views/publicholidays.php
View File

@ -31,15 +31,15 @@
<div class="card"> <div class="card">
<div class="row" style="padding: 18px 26px;"> <div class="row" style="padding: 18px 26px;">
<div class="col-md-3"> <div class="col-md-3">
<span>Holiday Name : </span> <label>Holiday Name : </label>
<input type="text" name="hname" id="hname" class="form-control"> <input type="text" name="hname" id="hname" class="form-control">
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<span>Date : </span> <label>Date : </label>
<input type="text" name="hdate" id="hdate" class="form-control"> <input type="text" name="hdate" id="hdate" class="form-control">
</div> </div>
<div class="col-md-3"> <div class="col-md-3">
<input type="button" id="Add" value="Add" class="btn btn-success" class="form-control" style="margin-top: 20px;margin-bottom: 0px;"> <input type="button" id="Add" value="Add" class="btn btn-success" class="form-control" style="margin-top: 25px;margin-bottom: 0px;">
</div> </div>
</div> </div>
<div class="card-body"> <div class="card-body">

69
app/Views/purchaseorder.php
View File

@ -51,6 +51,17 @@
.cancel-btn:hover { .cancel-btn:hover {
background-color: #f5c6cb; background-color: #f5c6cb;
} }
/* Container for the scrollable table */
.scrollable-table {
overflow: auto; /* Enable scrolling */
scrollbar-width: none; /* Hide scrollbar in Firefox */
-ms-overflow-style: none; /* Hide scrollbar in IE and Edge */
}
/* Hide scrollbar in WebKit browsers (Chrome, Safari, etc.) */
.scrollable-table::-webkit-scrollbar {
display: none; /* Hide scrollbar */
}
</style> </style>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
@ -481,7 +492,7 @@ if (!empty($INRSYMBOL)) {
$("#EditItemName").val(obj.MaterialName); $("#EditItemName").val(obj.MaterialName);
$("#EditUOM").val(obj.UOM); $("#EditUOM").val(obj.UOM);
$("#EditQuantity").val(obj.Quantity); $("#EditQuantity").val(obj.Quantity);
$("#EditRate").val(obj.material_rate); $("#EditRate").val(parseFloat(obj.material_rate).toFixed(2));
RequistQuantity = obj.Quantity; RequistQuantity = obj.Quantity;
} }
}); });
@ -2291,35 +2302,38 @@ if (!empty($INRSYMBOL)) {
</div> </div>
<label>Select Purchase Order File</label> <!-- f i l e c h o o s e n -->
<div class="form-row"> <div class="col-md-12">
<div class="row">
<div class="form-group col-md-12"> <div class="col-md-12">
<label>Select Purchase Order File</label><br>
<input type="file" name="POFile" id="POFile"><br> <input type="file" name="POFile" id="POFile"><br>
</div> </div>
</div>
</div>
</div> <!-- /. f i l e c h o o s e n -->
<!-- h i d d e n f i e l d s -->
<div class="form-row"> <div class= "col-md-12">
<div class="form-group col-md-12">
<div align="right" style="padding-right:10px">
<input type="hidden" name="txtPoRange" id="txtPoRange" /> <input type="hidden" name="txtPoRange" id="txtPoRange" />
<input type="hidden" name="isEdit" id="isEdit" value="0" /> <input type="hidden" name="isEdit" id="isEdit" value="0" />
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" /> <input type="hidden" name="txtRowCount" id="txtRowCount" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="Budget" id="Budget" /> <input type="hidden" name="Budget" id="Budget" />
<div class="btn-container" style="text-align: right;"> </div>
<a class="btn btn-secondary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Cancel</span></a> <!--/.h i d d e n f i e l d s -->
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a> <!-- f o o t e r b u t t o n -->
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <div class="col-md-12">
<div class="row">
<div class="col-md-12 text-right">
<a class="btn btn-danger Save" ID="Reset" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div>
</div> </div>
</div> </div>
</div><br /> <!--/. f o o t e r b u t t o n -->
</div>
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->
</div><!-- end col--> </div><!-- end col-->
@ -3290,7 +3304,7 @@ if (!empty($INRSYMBOL)) {
$('#EditItemName').val($('#materialName' + userid).val()); $('#EditItemName').val($('#materialName' + userid).val());
$('#EditUOM').val($('#uom' + userid).val()); $('#EditUOM').val($('#uom' + userid).val());
$('#EditQuantity').val($('#quantity' + userid).val()); $('#EditQuantity').val($('#quantity' + userid).val());
$('#EditRate').val($('#itemRate' + userid).val()); $('#EditRate').val(parseFloat($('#itemRate' + userid).val()).toFixed(2));
var p = $('#per' + userid).val() var p = $('#per' + userid).val()
if (p != "") { if (p != "") {
$('#EditPer').val($('#per' + userid).val()); $('#EditPer').val($('#per' + userid).val());
@ -3482,7 +3496,7 @@ if (!empty($INRSYMBOL)) {
</td> </td>
<td style="text-align:right !important">${quantity}</td> <td style="text-align:right !important">${quantity}</td>
<td style="text-align:left !important">${uom}</td> <td style="text-align:left !important">${uom}</td>
<td style="text-align:right !important">${itemRate}</td> <td style="text-align:right !important">${parseFloat(itemRate).toFixed(2)}</td>
<td style="text-align:right !important">${basicval}</td> <td style="text-align:right !important">${basicval}</td>
<td style="text-align:right !important">${TotalTaxValue}</td> <td style="text-align:right !important">${TotalTaxValue}</td>
<td style="text-align:right !important">${TotalOrderValue}</td> <td style="text-align:right !important">${TotalOrderValue}</td>
@ -3513,7 +3527,7 @@ if (!empty($INRSYMBOL)) {
addHidden(theForm, "materialName" + temp, materialName); addHidden(theForm, "materialName" + temp, materialName);
addHidden(theForm, "uom" + temp, uom); addHidden(theForm, "uom" + temp, uom);
addHidden(theForm, "quantity" + temp, quantity); addHidden(theForm, "quantity" + temp, quantity);
addHidden(theForm, "itemRate" + temp, itemRate); addHidden(theForm, "itemRate" + temp, parseFloat(itemRate).toFixed(2));
addHidden(theForm, "per" + temp, per); addHidden(theForm, "per" + temp, per);
addHidden(theForm, "DisType" + temp, DisType); addHidden(theForm, "DisType" + temp, DisType);
addHidden(theForm, "DisVal" + temp, DisVal); addHidden(theForm, "DisVal" + temp, DisVal);
@ -3549,7 +3563,6 @@ if (!empty($INRSYMBOL)) {
$('.EditRevenue').click(function() { $('.EditRevenue').click(function() {
tinyMCE.triggerSave(); tinyMCE.triggerSave();
if (validateEditRevenueTax() && validateEditExceedLimit() && ExceedEditQuantityCheck()) { if (validateEditRevenueTax() && validateEditExceedLimit() && ExceedEditQuantityCheck()) {
// alert('inside Add');
var CostCode = $("#EditCostCenter").val(); var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val(); var AvilBudget = $('#EditAvlBudAmt').val();
var editMaterialCode = $("#EditMaterialCode").val(); var editMaterialCode = $("#EditMaterialCode").val();
@ -3557,7 +3570,7 @@ if (!empty($INRSYMBOL)) {
var editUOM = $('#EditUOM').val(); var editUOM = $('#EditUOM').val();
var editQuantity = $('#EditQuantity').val(); var editQuantity = $('#EditQuantity').val();
var itemRate = $("#EditRate").val(); var itemRate = parseFloat($("#EditRate").val()).toFixed(2);
var per = $('#EditPer').val(); var per = $('#EditPer').val();
if (per == "") { if (per == "") {
per = $('#EditUOM').val(); per = $('#EditUOM').val();
@ -3606,7 +3619,7 @@ if (!empty($INRSYMBOL)) {
$('#materialName' + userid).val(editDescription); $('#materialName' + userid).val(editDescription);
$('#uom' + userid).val(editUOM); $('#uom' + userid).val(editUOM);
$('#quantity' + userid).val(editQuantity); $('#quantity' + userid).val(editQuantity);
$('#itemRate' + userid).val(itemRate); $('#itemRate' + userid).val(parseFloat(itemRate).toFixed(2));
$('#per' + userid).val(per); $('#per' + userid).val(per);
$('#DisType' + userid).val(DisType); $('#DisType' + userid).val(DisType);
$('#DisVal' + userid).val(DisVal); $('#DisVal' + userid).val(DisVal);

16
app/Views/rawmaterialListing.php
View File

@ -235,7 +235,7 @@
<!-- Long Content Scroll Modal --> <!-- Long Content Scroll Modal -->
<div class="modal fade" id="scrollable-modal" tabindex="-1" role="dialog" aria-labelledby="scrollableModalTitle" aria-hidden="true" style="max-width: 100%;"> <div class="modal fade" id="scrollable-modal" tabindex="-1" role="dialog" aria-labelledby="scrollableModalTitle" aria-hidden="true" style="max-width: 100%;">
<div class="modal-dialog modal-dialog-scrollable" role="document" style="max-width: 50%;"> <div class="modal-dialog modal-dialog-scrollable modal-lg" role="document" style="max-width: 65%;">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="scrollableModalTitle">Material Details</h5> <h5 class="modal-title" id="scrollableModalTitle">Material Details</h5>
@ -312,7 +312,7 @@ $(document).ready(function () {
<th style="text-align: center;" >PONO</th> <th style="text-align: center;" >PONO</th>
<th style="text-align: center;" >PO Type</th> <th style="text-align: center;" >PO Type</th>
<th style="text-align: center;" >Total Value</th> <th style="text-align: center;" >Total Value</th>
<th style="text-align: center;" >Action</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -321,6 +321,9 @@ $(document).ready(function () {
result.forEach(item => { result.forEach(item => {
CreatedDate = formatDate(item.CreatedDate); CreatedDate = formatDate(item.CreatedDate);
TotalOrderValue = formatNumberToIndianCurrency(item.TotalOrderValue); TotalOrderValue = formatNumberToIndianCurrency(item.TotalOrderValue);
baseUrl = "<?php echo base_url() ?>";
href = `${baseUrl}purchaseorder/CreatePOPrint?PONO=${item.PONO}&ReqType=${item.ReqType}`;
tableHtml += ` tableHtml += `
<tr> <tr>
<td>${CreatedDate}</td> <td>${CreatedDate}</td>
@ -328,9 +331,14 @@ $(document).ready(function () {
<td class="pono-cell" data-pono="${item.PONO}" data-potype="${item.POType}" data-capitalrange="${item.CapitalRange}" style="cursor: pointer; color: #4d3a6d;"> <td class="pono-cell" data-pono="${item.PONO}" data-potype="${item.POType}" data-capitalrange="${item.CapitalRange}" style="cursor: pointer; color: #4d3a6d;">
${item.PONO} ${item.PONO}
</td> </td>
<td style="text-align: right;">${item.POType}</td> <td style="text-align: right;">${item.POType}</td>
<td style="text-align: right;">${TotalOrderValue}</td> <td style="text-align: right;">${TotalOrderValue}</td>
</tr> <td style="text-align: center;">
<a data-toggle="tooltip" href=${href} target="_blank">
<i class="fa fa-print" data-toggle="tooltip" title="${item.PONO} - Click here to Print the Purchase Order details"></i>
</a>
</td>
</tr>
`; `;
}); });

11
app/Views/requisitionform.php
View File

@ -24,6 +24,17 @@ if (!empty($Emp)) {
background-color: rgb(32, 176, 130); /* Slightly darker shade for hover */ background-color: rgb(32, 176, 130); /* Slightly darker shade for hover */
border-color: rgb(32, 176, 130); border-color: rgb(32, 176, 130);
} }
/* Container for the scrollable table */
.scrollable-table {
overflow: auto; /* Enable scrolling */
scrollbar-width: none; /* Hide scrollbar in Firefox */
-ms-overflow-style: none; /* Hide scrollbar in IE and Edge */
}
/* Hide scrollbar in WebKit browsers (Chrome, Safari, etc.) */
.scrollable-table::-webkit-scrollbar {
display: none; /* Hide scrollbar */
}
.th{ .th{
font-size: 14px; font-size: 14px;

8
app/Views/requisitionlisting.php
View File

@ -144,10 +144,10 @@ if (!empty($Status)) {
<th class="th">Requisted Date</th> <th class="th">Requisted Date</th>
<th class="th">Requisition No</th> <th class="th">Requisition No</th>
<th class="th">Requisition Type</th> <th class="th">Requisition Type</th>
<th class="th">Tot No.OfLineItem </th> <th class="th">Total Line Items</th>
<th class="th">Po CreatedLineItem</th> <th class="th">PO Created</th>
<th class="th">Partially PoCreatedLineItem</th> <th class="th">Partial PO </th>
<th class="th">NewLine Item</th> <th class="th">New</th>
<th class="th">Status</th> <th class="th">Status</th>
<th class="th">Action</th> <th class="th">Action</th>
</tr> </tr>

76
app/Views/servicePurchaseorder.php
View File

@ -51,6 +51,17 @@
.cancel-btn:hover { .cancel-btn:hover {
background-color: #f5c6cb; background-color: #f5c6cb;
} }
/* Container for the scrollable table */
.scrollable-table {
overflow: auto; /* Enable scrolling */
scrollbar-width: none; /* Hide scrollbar in Firefox */
-ms-overflow-style: none; /* Hide scrollbar in IE and Edge */
}
/* Hide scrollbar in WebKit browsers (Chrome, Safari, etc.) */
.scrollable-table::-webkit-scrollbar {
display: none; /* Hide scrollbar */
}
</style> </style>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
@ -672,7 +683,6 @@ if (!empty($INRSYMBOL)) {
console.log("2222222222222222"); console.log("2222222222222222");
if (validateEditServiceTax()) { if (validateEditServiceTax()) {
alert('inside Add');
var CostCode = $("#EditCostCenter").val(); var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val(); var AvilBudget = $('#EditAvlBudAmt').val();
var editMaterialCode = $("#EditMaterialCode").val(); var editMaterialCode = $("#EditMaterialCode").val();
@ -1153,34 +1163,38 @@ if (!empty($INRSYMBOL)) {
<br> <br>
<div class="form-row"> <!-- f i l e c h o o s e n -->
<div class="form-group col-md-12"> <div class="col-md-12">
<label for="POFile">Select Purchase Order File</label> <div class="row">
<input type="file" class="d-block" name="POFile" id="POFile"><br> <div class="col-md-12">
</div>
</div> <label for="POFile">Select Purchase Order File</label>
<input type="file" class="d-block" name="POFile" id="POFile"><br>
</div>
<div class="form-row"> </div>
<div class="form-group col-md-12"> </div>
<br /> <!-- /. f i l e c h o o s e n -->
<div align="right" style="padding-right:10px"> <!-- h i d d e n f i e l d s -->
<div class= "col-md-12">
<input type="hidden" name="txtStatus" id="txtStatus" /> <input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" /> <input type="hidden" name="txtRowCount" id="txtRowCount" />
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" /> <input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
<input type="hidden" name="SpcialInstruction" id="SpcialInstruction"> <input type="hidden" name="SpcialInstruction" id="SpcialInstruction">
<input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress"> <input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress">
<input type="hidden" name="Budget" id="Budget" /> <input type="hidden" name="Budget" id="Budget" />
<div class="btn-container" style="text-align: right;"> </div>
<!--/.h i d d e n f i e l d s -->
<a class="btn btn-secondary Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a> <!-- f o o t e r b u t t o n -->
<a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a> <div class="col-md-12">
<a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a> <div class="row">
</div><!-- 7.4 btn-container div closed here --> <div class="col-md-12 text-right">
</div><br /><!-- 7.4 right div closed here --> <a class="btn btn-danger Save" ID="Cancel" onclick="Reset();">&nbsp;&nbsp;<span class="bold">Reset</span></a>
</div><!-- 7.4 row div closed here --> <a class="btn btn-success Save" ID="Save" onclick="Save(0)">&nbsp;&nbsp;<span class="bold">Save as Draft</span></a>
</div><!-- 11 form-row div closed here --> <a class="btn btn-success Submit" ID="Submit" onclick="Save(1)">&nbsp;&nbsp;<span class="bold">Submit</span></a>
</div>
</div>
</div>
<!--/. f o o t e r b u t t o n -->
</div> <!-- end card body--> </div> <!-- end card body-->
</div> <!-- end card --> </div> <!-- end card -->
</div><!-- end col--> </div><!-- end col-->
@ -1465,9 +1479,7 @@ if (!empty($INRSYMBOL)) {
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label>Service Description </label> <label>Service Description <span class="text-danger">*</span></label>
<?php <?php
$data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); $data = array('name' => 'txtSpcialInstruction', 'value' => set_value('txtSpcialInstruction'), 'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data); ?> echo form_textarea($data); ?>
@ -1747,7 +1759,7 @@ if (!empty($INRSYMBOL)) {
<div class="form-row"> <div class="form-row">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<label>Service Description </label> <label>Service Description <span class="text-danger">*</span></label>
<?php <?php
$data = array('name' => 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction'), 'id' => 'EdittxtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40'); $data = array('name' => 'EdittxtSpcialInstruction', 'value' => set_value('EdittxtSpcialInstruction'), 'id' => 'EdittxtSpcialInstruction', 'class' => 'form-control', 'rows' => '3', 'cols' => '40');
echo form_textarea($data); ?> echo form_textarea($data); ?>
@ -1901,7 +1913,6 @@ if (!empty($INRSYMBOL)) {
tinyMCE.triggerSave(); tinyMCE.triggerSave();
if (validateServiceTax()) { if (validateServiceTax()) {
// alert('inside Addservice');
var temp = index; var temp = index;
var Reqnumber = $('#ReqNo').val(); var Reqnumber = $('#ReqNo').val();
var departmentName = $('#deptName').val(); var departmentName = $('#deptName').val();
@ -2291,6 +2302,10 @@ if (!empty($INRSYMBOL)) {
} else if (ExceedBudget($('#txtBasicValue').val(), $('#AvlBudAmt').val()) == false) { } else if (ExceedBudget($('#txtBasicValue').val(), $('#AvlBudAmt').val()) == false) {
$('#Rate').focus(); $('#Rate').focus();
return false; return false;
} else if ($('#txtSpcialInstruction').val() == '') {
alert('Please Enter the Service Description');
$('#txtSpcialInstruction').focus();
return false;
} else { } else {
return true; return true;
} }
@ -2328,6 +2343,10 @@ if (!empty($INRSYMBOL)) {
} else if (ExceedBudget($('#txtEditBasicValue').val(), $('#EditAvlBudAmt').val()) == false) { } else if (ExceedBudget($('#txtEditBasicValue').val(), $('#EditAvlBudAmt').val()) == false) {
$('#EditRate').focus(); $('#EditRate').focus();
return false; return false;
} else if ($('#EdittxtSpcialInstruction').val() == '') {
alert('Please Enter the Service Description');
$('#EdittxtSpcialInstruction').focus();
return false;
} else { } else {
return true; return true;
} }
@ -2399,7 +2418,6 @@ if (!empty($INRSYMBOL)) {
} else { } else {
var formData = new FormData($('.ServicePO')[0]); var formData = new FormData($('.ServicePO')[0]);
$('#loader').show(); $('#loader').show();
console.log("inside add service purchase order view page");
console.log(formData); console.log(formData);

2
app/Views/viewinwardgateregister.php
View File

@ -529,7 +529,7 @@
<label> Master IGR file</label> <label> Master IGR file</label>
<br> <br>
<input type="file" name="MasterFile" id="MasterFile" onchange="filenames(this.name); "> <input type="file" name="MasterFile" id="MasterFile" onchange="filenames(this.name); ">
<label id="MasterFileLabel" style="display:none;"> <label id="MasterFileLabel" style="display:none;" class="mt-1">
<a><span></span><small></small></a> <a><span></span><small></small></a>
</label> </label>
</div> </div>

1
public/assets/js/CreatePOValidation.js
View File

@ -171,6 +171,7 @@ function serviceValidate(){
function capitalValidate(){ function capitalValidate(){
var radioValue = parseInt($("input[name='DateRange']:checked").val()); var radioValue = parseInt($("input[name='DateRange']:checked").val());
var PoType = $('#POType').val(); var PoType = $('#POType').val();
console.log("createPovalidation",capitalType);
if(PoType=='CAPITAL' && capitalType=='International'){ if(PoType=='CAPITAL' && capitalType=='International'){