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

CHANGE_TRACKER_ISSUE_5

Browse Source
This commit is contained in:
aadhavan valli 2024-09-17 18:29:16 +05:30
parent be86795246
commit 4fd1e396fc
21 changed files with 2951 additions and 2984 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/Controllers/Amendmentpurchaseorder.php
View File

@ -33,7 +33,6 @@ class Amendmentpurchaseorder extends BaseController
// $this->session = \CodeIgniter\Config\Factories::libraries('session');
helper(['form']);
$this->isLoggedIn();
}
/**
@ -210,7 +209,7 @@ class Amendmentpurchaseorder extends BaseController
*/
function EditRevenuePurchaseOrder()
{
// print_r($this->request->getPost());die;
$NewPO = '';
$MAD = '';
$PONO = $this->request->getPost('txtPONO');
@ -232,7 +231,6 @@ class Amendmentpurchaseorder extends BaseController
$Deliverydt = get_date_time_format($dt);
$DeliverySchedule = '';
}
$Modeofshipment = $this->request->getPost('addmodeofshipment');
$supplierreference = $this->request->getPost('amendsupplierreference');
$supplieroffno = $this->request->getPost('amendsupplierofferno');
@ -296,12 +294,13 @@ class Amendmentpurchaseorder extends BaseController
if (!empty($requestfilename)) {
if ($file && $file->isValid() && !$file->hasMoved()) {
$path = ROOTPATH . 'public/uploads/POfiles/';
if(!is_dir($path)) { mkdir($path, 0777, true); }
if (!is_dir($path)) {
mkdir($path, 0777, true);
}
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
log_message('error', 'File already exists in the database' . $requestfilename);
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
}
else{
} else {
$file->move($path, $requestfilename);
$POMaster['POFile'] = $requestfilename;
}
@ -311,10 +310,17 @@ class Amendmentpurchaseorder extends BaseController
} else {
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
}
// print_r($POMaster);die;
$LastPO = $this->purchaseorder_model->addAmendPOMaster($POMaster, $updatedBy, $PONO);
// dd($LastPO);
if(!empty($LastPO)){
if (count($LastPO) > 0) {
$NewPO = $LastPO[0]['PONO'];
}
}else{
$NewPO = "";
}
$PODetail = array('Status' => PO_AMENDED); //TO SET PARENT PO AS AMENDMENT STATUS
@ -649,12 +655,13 @@ class Amendmentpurchaseorder extends BaseController
if (!empty($requestfilename)) {
if ($file && $file->isValid() && !$file->hasMoved()) {
$path = ROOTPATH . 'public/uploads/POfiles/';
if(!is_dir($path)) { mkdir($path, 0777, true); }
if (!is_dir($path)) {
mkdir($path, 0777, true);
}
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
log_message('error', 'File already exists in the database' . $requestfilename);
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
}
else{
} else {
$file->move($path, $requestfilename);
$POMaster['POFile'] = $requestfilename;
}
@ -969,12 +976,13 @@ class Amendmentpurchaseorder extends BaseController
if (!empty($requestfilename)) {
if ($file && $file->isValid() && !$file->hasMoved()) {
$path = ROOTPATH . 'public/uploads/POfiles/';
if(!is_dir($path)) { mkdir($path, 0777, true); }
if (!is_dir($path)) {
mkdir($path, 0777, true);
}
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
log_message('error', 'File already exists in the database' . $requestfilename);
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
}
else{
} else {
$file->move($path, $requestfilename);
$POMaster['POFile'] = $requestfilename;
}
@ -1365,12 +1373,13 @@ class Amendmentpurchaseorder extends BaseController
if (!empty($requestfilename)) {
if ($file && $file->isValid() && !$file->hasMoved()) {
$path = ROOTPATH . 'public/uploads/POfiles/';
if(!is_dir($path)) { mkdir($path, 0777, true); }
if (!is_dir($path)) {
mkdir($path, 0777, true);
}
if (!empty($this->purchaseorder_model->isFileExists($requestfilename))) {
log_message('error', 'File already exists in the database' . $requestfilename);
$POMaster['POFile'] = $PrePOFile ? $PrePOFile : null;
}
else{
} else {
$file->move($path, $requestfilename);
$POMaster['POFile'] = $requestfilename;
}
@ -1635,5 +1644,4 @@ class Amendmentpurchaseorder extends BaseController
echo 'Purchase Order is' . $PONO . 'Amended Successfully! New PO Number is: ' . $NewPO;
}
}

4
app/Controllers/Inwardgateregister.php
View File

@ -321,9 +321,9 @@ class Inwardgateregister extends BaseController
$IsThisOpenOrderPO = $this->request->getPost('hiddenIsOpenOrder');
$DeliveryChellanOrInvoiceNo = $this->request->getPost('InvoiceNo');
$DeliveryChellan = (string)$this->request->getPost('InvoiceDate');
$DeliveryChellanDate = get_date_time_format($DeliveryChellan);
$DeliveryChellanDate = get_date_time_format_new($DeliveryChellan);
$Mat_Rcvd_Dt = (string)$this->request->getPost('MaterialRcvdDate');
$MaterialRcvdDt = get_date_time_format($Mat_Rcvd_Dt);
$MaterialRcvdDt = get_date_time_format_new($Mat_Rcvd_Dt);
$VehicleNo = $this->request->getPost('VehicleNo');
$TransporterId = $this->request->getPost('TransporterId');
$DriverName = $this->request->getPost('DriverName');

3
app/Controllers/Purchaseorder.php
View File

@ -634,6 +634,7 @@ class Purchaseorder extends BaseController
//$data['WorkStatus']=$this->purchaseorder_model->GetWorkStatus('C019');
$data['WorkStatus'] = $this->purchaseorder_model->getStatus(7);
// echo "<pre>";
// print_r($data);die;
$this->global['pageTitle'] = 'Edit Service Purchase order form';
$this->loadViews("EditservicePurchaseorder", $this->global, $data, NULL);
@ -1212,6 +1213,8 @@ class Purchaseorder extends BaseController
//This used to Edit the Revenue Purchase Order
function EditRevenuePurchaseOrder()
{
$PONO = $this->request->getPost('txtPONO');
$POdt = $this->request->getPost('PODate');
$PODate = get_date_time_format($POdt);

1
app/Controllers/Servicepurchaseorder.php
View File

@ -347,6 +347,7 @@ class Servicepurchaseorder extends BaseController
$newSupId = preg_split('[-]', (string)$newsup);
$POdt = $this->request->getPost('PODate');
// print_r($this->request->getPost());die;
$PODate = get_date_time_format($POdt);
/*-----------------------------------*/
$b4supplier = $this->request->getPost('b4supplier');

10
app/Helpers/datetime_helper.php
View File

@ -26,12 +26,20 @@ if (!function_exists('get_current_date')) {
if (!function_exists('get_date_time_format')) {
function get_date_time_format($val)
{
$date = new \DateTime($val, new \DateTimeZone('Asia/Kolkata'));
$date = new \DateTime($val, timezone: new \DateTimeZone('Asia/Kolkata'));
return $date->format('Y-m-d H:i:s');
}
}
if (!function_exists('get_date_time_format_new')) {
function get_date_time_format_new($val)
{
$date = \DateTime::createFromFormat('d/m/Y', $val, new \DateTimeZone('Asia/Kolkata'));
return $date->format('Y-m-d H:i:s');
}
}
if (!function_exists('get_date_format')) {
function get_date_format($DateValue)
{

4
app/Models/Monthlypay_model.php
View File

@ -39,7 +39,7 @@ class Monthlypay_model extends Model
// $this->db->where('t_employee_details.DateofJoining <=',$lastdate);
// $this->db->where('Month_Year',$current);
$sql = "select t_monthly_pay_inputs.*,t_employee_details.FirstName,t_employee_details.LastName,t_loan_master.Loan_ID,t_loan_master.Monthly_Due,t_payroll.Key
$sql = "select t_monthly_pay_inputs.*,t_employee_details.FirstName,t_employee_details.LastName,t_loan_master.Loan_ID,t_loan_master.Monthly_Due,t_payroll.Id
from t_monthly_pay_inputs
left join t_employee_details on t_monthly_pay_inputs.EmpID=t_employee_details.EmpID and t_employee_details.DateofJoining <= ?
left join t_payroll on t_monthly_pay_inputs.EmpID=t_payroll.EmpID
@ -100,7 +100,7 @@ class Monthlypay_model extends Model
//echo $lastdate;
//left join t_payroll on t_employee_details.EmpID = t_payroll.EmpID and month(t_payroll.PayOn) = month(?) and year(t_payroll.PayOn) = year(?)
$sql = "select t_emp_pay_data.EmpID,t_emp_pay_data.*,t_employee_details.FirstName,t_employee_details.DateofJoining,t_employee_details.Designation,t_employee_details.esi_applicable,t_employee_details.pf_applicable,t_employee_details.is_management_team,t_attendance.Days_Worked as Days_worked,t_attendance.Absent as LOP_Days,t_attendance.Paid_Leave as Paid_leave,t_attendance.Total_OTHrs as OT_Hrs_Worked,t_attendance.NoofDays,t_attendance.sunday_count,t_loan_master.Loan_ID,t_loan_master.Monthly_Due,t_loan_master.Due_Start_Date as DueDate,t_loan_master.Loan_Amount,t_loan_master.Paid_Amount,t_payroll.Key,t_monthly_pay_inputs.Loan_Recovered,t_monthly_pay_inputs.Estimate,t_monthly_pay_inputs.Festival_Bonus,t_monthly_pay_inputs.Other_Deductions,t_loan_history .Balance_Amount
$sql = "select t_emp_pay_data.EmpID,t_emp_pay_data.*,t_employee_details.FirstName,t_employee_details.DateofJoining,t_employee_details.Designation,t_employee_details.esi_applicable,t_employee_details.pf_applicable,t_employee_details.is_management_team,t_attendance.Days_Worked as Days_worked,t_attendance.Absent as LOP_Days,t_attendance.Paid_Leave as Paid_leave,t_attendance.Total_OTHrs as OT_Hrs_Worked,t_attendance.NoofDays,t_attendance.sunday_count,t_loan_master.Loan_ID,t_loan_master.Monthly_Due,t_loan_master.Due_Start_Date as DueDate,t_loan_master.Loan_Amount,t_loan_master.Paid_Amount,t_payroll.Id,t_monthly_pay_inputs.Loan_Recovered,t_monthly_pay_inputs.Estimate,t_monthly_pay_inputs.Festival_Bonus,t_monthly_pay_inputs.Other_Deductions,t_loan_history .Balance_Amount
from t_emp_pay_data
left join t_employee_details on t_employee_details.EmpID = t_emp_pay_data.EmpID
left join t_payroll on t_employee_details.EmpID = t_payroll.EmpID and t_payroll.PayOn = ?

5
app/Models/Purchaseorder_model.php
View File

@ -829,13 +829,16 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
$insert_id = $this->db->affectedRows();
$this->db->transComplete();
// print_r($insert_id);die;
if ($insert_id > 0) {
$subQuery = 'select PONO from t_purchaseorder_master where CreatedBy=? and ParentPO=? order by CreatedDate desc limit 1';
$query = $this->db->query($subQuery, array($CreatedBy, $ParentPO));
return $query->getResultArray();
}else{
return false;
}
}

37
app/Views/AmendPOlist.php
View File

@ -6,25 +6,30 @@
}
</style>
<style>
.Date-filter-form {
display: flex;
align-items: center;
gap: 10px; /* Adjust the gap as needed */
gap: 10px;
/* Adjust the gap as needed */
}
.Date-filter-form input, .Date-filter-form button {
.Date-filter-form input,
.Date-filter-form button {
padding: 5px;
font-size: 14px;
}
.Date-filter-form button {
background-color: #007bff;
color: white;
border: none;
cursor: pointer;
}
.Date-filter-form button:hover {
background-color: #0056b3;
}
.icon-button {
background: none;
border: none;
@ -32,10 +37,13 @@
color: #007bff;
font-size: 18px;
}
.icon-button:hover {
color: #0056b3;
}
th, td {
th,
td {
white-space: nowrap;
}
</style>
@ -68,7 +76,7 @@
<div class="error" id="error"></div>
</form>
<div class="card-body">
<table id="amend_po_list" class="table dt-responsive nowrap w-100">
<table id="amend_po_list" class="table dt-responsive wrap w-100">
<thead>
<tr>
<!-- <th>#</th> -->
@ -93,14 +101,14 @@
?>
<tr id="<?php echo $index; ?>">
<!-- <td align="left"><?php echo $index; ?></td> -->
<td align="right"><?php $Pdt = new DateTime($record->PODate);
<td><?php $Pdt = new DateTime($record->PODate);
$PODate = $Pdt->format('d-m-Y');
echo $PODate
?></td>
<td><?php echo $record->PONO ?></td>
<td><?php echo $record->ReqType ?></td>
<td><?php echo $record->SupplierName ?></td>
<td align="right"><?php echo $record->TotalOrderValue ?></td>
<td><?php echo $record->TotalOrderValue ?></td>
<!-- <td><?php echo $record->StatusName ?></td> -->
<td><?php
@ -129,7 +137,7 @@
$option = "By Dispatch Instruction";
}
echo $option ?></td>
<td align="right"><?php
<td><?php
if ($record->DeliveryOption == 0) {
$Ddt = new DateTime($record->DeliveryDate);
$Deliverydt = $Ddt->format('d-m-Y');
@ -195,6 +203,9 @@ $(document).ready(function() {
});
$(document).ready(function() {
$(document).on('click', '.text-truncate', function() {
$(this).toggleClass('expanded');
});
// Initialize the DataTable
var table = $('#amend_po_list').DataTable({
dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
@ -202,9 +213,17 @@ $(document).ready(function() {
'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
],
pageLength: 10, // Default rows per page
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
lengthMenu: [
[10, 20, 30, 50, -1],
[10, 20, 30, 50, "All"]
], // Rows per page options
responsive: true, // Responsive table
order: [], // Default ordering (column index 0, descending)
columnDefs: [{
targets: '_all',
className: 'text-truncate'
}, // Apply truncation to all columns
],
language: {
paginate: {
next: '<i class="fas fa-angle-right"></i>', // Next button icon

38
app/Views/EditservicePurchaseorder.php
View File

@ -759,7 +759,7 @@ if (!empty($getlogpodtl)) {
<?php } else { ?>
<h4><?= "Amended Service Purchase Order - $PONO "; ?></h4>
<?php } ?>
<a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-success" id="back" value="Back">Back</a>
<a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-secondary" id="back" value="Back">Back</a>
</div>
</div>
</div>
@ -1197,7 +1197,8 @@ if (!empty($getlogpodtl)) {
<?php
if ($PONOStatus == PO_DRAFT || $PONOStatus == PO_CREATED || $PONOStatus == REQITEM_Emergency_PO_CREATED || $PONOStatus == PO_APPROVED || $PONOStatus == SPECIAL_PO) { ?>
<td> <a data-target='#EDITSERVICE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITSERVICE"><i class="ri-pencil-fill" data-toggle="tooltip" title="Click here to view/Edit the <?php echo $record->ReqNo; ?> Requisition details"></i>&nbsp;&nbsp;&nbsp;</a> <a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
<td> <a data-target='#EDITSERVICE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#EDITSERVICE"><i class="ri-pencil-fill" title="Click here to view/Edit the . <?php echo $record->ReqNo; ?> .Requisition details"></i></a>
<a href='#' onclick="DeleteRow(<?php echo $index; ?>)" class="link" data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" id="Del"><span class="ri-delete-bin-7-fill"></span></a>
<?php
} else { ?>
<td> <a data-target='#VIEWSERVICE' data-id="<?php echo $index; ?>" data-userid="<?php echo $index; ?>" data-toggle="modal" href="#VIEWSERVICE"><i class="fa fa-eye" data-toggle="tooltip" title="<?php echo $record->ReqNo; ?> - Click here to view Requistion details"></i>&nbsp;&nbsp;&nbsp;</a> </td>
@ -1436,7 +1437,7 @@ if (!empty($getlogpodtl)) {
<input type="hidden" id="PrePOFile" name="PrePOFile" value="<?php echo $PrePOFile; ?>" /><br>
</div> <input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>" />
<input type="hidden" name="txtStatus" id="txtStatus" />
<input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $index; ?>">
<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="Budget" id="Budget" value="<?php echo $BudgetType; ?>" />
@ -1460,11 +1461,11 @@ if (!empty($getlogpodtl)) {
</div>
<label>Request On : </label><?php echo $Reqon; ?><br />
<?php if ($RequesterName != '' || $RequesterName != null) { ?>
<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 = [
@ -2023,7 +2024,7 @@ if (!empty($getlogpodtl)) {
</div>
<div class="modal-footer">
<div class="form-row">
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin:10px;">Cancel</a>
<a class="btn btn-success font EditService" ID="Edit">&nbsp;&nbsp;<span class="bold">Update Service</span></a>
</div>
</div>
@ -2336,7 +2337,7 @@ if (!empty($getlogpodtl)) {
</tr>
</script> -->
<script>
var index = <?php echo $index; ?>;
var index = <?php if(isset($index)){ echo $index; } ?>;
var userid = '';
var SelectedMaterialCode = [];
var CollIndex = 0;
@ -2512,9 +2513,7 @@ $('#ServiceAppend').append(rowHtml);
}
$('.EditService').click(function() {
tinyMCE.triggerSave();
if (validateEditServiceTax()) {
var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val();
var editMaterialCode = $("#EditMaterialCode").val();
@ -2581,6 +2580,7 @@ $('#ServiceAppend').append(rowHtml);
$('#ItemDescription' + userid).val(ServiceDescription);
$('#OtherAmt' + userid).val(OtherAmt);
populateValueMainFormForEditServiceTax();
$('#EDITSERVICE').modal('hide');
}
});
@ -2805,7 +2805,7 @@ $('#ServiceAppend').append(rowHtml);
url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
success: function(data) {
if (data) {
$('#content').loader('hide');
// $('#content').loader('hide');
alert(data);
} else {
alert("Error");
@ -2999,7 +2999,7 @@ $('#ServiceAppend').append(rowHtml);
$('#editdescofpo').focus();
return false;
} else {
$('#content').loader('show');
// $('#content').loader('show');
var formData = new FormData($('.ServicePO')[0]);
$.ajax({
// data: $('.ServicePO').serialize(),
@ -3010,7 +3010,7 @@ $('#ServiceAppend').append(rowHtml);
contentType: false,
success: function(data) {
if (data) {
$('#content').loader('hide');
// $('#content').loader('hide');
alert(data);
$('#txtRowCount').val('');
$('#txtDeletedRow').val('');
@ -3020,7 +3020,7 @@ $('#ServiceAppend').append(rowHtml);
window.location = "purchaseorderListing";
} else {
$('#content').loader('hide');
// $('#content').loader('hide');
alert("Error");
}
@ -3288,7 +3288,7 @@ $('#ServiceAppend').append(rowHtml);
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
// For Binding Material list center for the selected Requistion Number
$("#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()));
var isAdded = "0";
for (i = 0; i < Material.length; i++) {
@ -3467,7 +3467,7 @@ $('#ServiceAppend').append(rowHtml);
// formData.append('param5',param5);
// formData.append('param6',param6);
$('.content').loader('show');
// $('.content').loader('show');
$.ajax({
data: formData,
type: "POST",
@ -3479,7 +3479,7 @@ $('#ServiceAppend').append(rowHtml);
if (data) {
alert(data);
window.location.reload();
$('.content').loader('hide');
// $('.content').loader('hide');
//$('#spl').find('td').eq(1).text(filename[2]);
$('#EditServiceSplPOModel').modal('hide');
}
@ -3519,7 +3519,7 @@ $('#ServiceAppend').append(rowHtml);
formData.append('count', counter);
// formData.append('igr',igr);
$('.content').loader('show');
// $('.content').loader('show');
$.ajax({
data: formData,
type: "POST",
@ -3531,7 +3531,7 @@ $('#ServiceAppend').append(rowHtml);
if (data) {
alert(data);
window.location.reload();
$('.content').loader('hide');
// $('.content').loader('hide');
// $('#spl').find('td').eq(5).text(filename[2]);
$('#EditServiceSplPOModel').modal('hide');
}

46
app/Views/POlist.php
View File

@ -1,23 +1,28 @@
<style>
.Date-filter-form {
display: flex;
align-items: center;
gap: 10px; /* Adjust the gap as needed */
gap: 10px;
/* Adjust the gap as needed */
}
.Date-filter-form input, .Date-filter-form button {
.Date-filter-form input,
.Date-filter-form button {
padding: 5px;
font-size: 14px;
}
.Date-filter-form button {
background-color: #007bff;
color: white;
border: none;
cursor: pointer;
}
.Date-filter-form button:hover {
background-color: #0056b3;
}
.icon-button {
background: none;
border: none;
@ -25,10 +30,13 @@
color: #007bff;
font-size: 18px;
}
.icon-button:hover {
color: #0056b3;
}
th, td {
th,
td {
white-space: nowrap;
}
</style>
@ -38,18 +46,22 @@
justify-content: space-between;
align-items: center;
}
.dataTables_wrapper .dataTables_length {
/* float: left; */
}
.dataTables_wrapper .dt-buttons,
.dataTables_wrapper .dataTables_filter {
/* float: right; */
/* margin-left: 10px; */
}
.dataTables_wrapper .dt-buttons {
/* margin-top: 10px; */
/* margin-bottom: 10px; */
}
.dataTables_wrapper .dataTables_filter {
/* margin-top: 10px; */
/* margin-bottom: 10px; */
@ -94,10 +106,11 @@
<input class="form-control date_range" type="date" id="toDate" name="toDate" placeholder="Select To Date" autocomplete="off" required>
<button type="submit" class="range_search_button"><i class="fe-search" aria-hidden="true" class="icon-button" title="Search"></i></button>
<i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i> <div class="error" id="error"></div>
<i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
<div class="error" id="error"></div>
</form>
<div class="card-body">
<table id="po_list" class="table dt-responsive nowrap w-100">
<table id="po_list" class="table dt-responsive wrap w-100">
<thead>
<tr>
<th>PO Date</th>
@ -120,7 +133,7 @@
$index = $index + 1;
?>
<tr id="<?php echo $index; ?>">
<td align="right"><?php $Pdt = new DateTime($record->PODate);
<td><?php $Pdt = new DateTime($record->PODate);
$PODate = $Pdt->format('d-m-Y');
echo $PODate
?></td>
@ -128,7 +141,7 @@
<td><?php echo $record->ReqType ?></td>
<td><?php echo $record->SupplierName ?></td>
<td align="right"><?php echo $record->TotalOrderValue ?></td>
<td><?php echo $record->TotalOrderValue ?></td>
<!-- <td><?php echo $record->StatusName ?></td> -->
<td><?php
@ -156,7 +169,7 @@
$option = "By Dispatch Instruction";
}
echo $option ?></td>
<td align="right"><?php
<td><?php
if ($record->DeliveryOption == 0) {
$Ddt = new DateTime($record->DeliveryDate);
$Deliverydt = $Ddt->format('d-m-Y');
@ -234,6 +247,10 @@
<script>
$(document).ready(function() {
$(document).on('click', '.text-truncate', function() {
$(this).toggleClass('expanded');
});
// Initialize the DataTable
var table = $('#po_list').DataTable({
dom: 'Blfrtip', // Buttons, length menu, filter, table, information, pagination
@ -241,9 +258,17 @@ $(document).ready(function() {
'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
],
pageLength: 10, // Default rows per page
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
lengthMenu: [
[10, 20, 30, 50, -1],
[10, 20, 30, 50, "All"]
], // Rows per page options
responsive: true, // Responsive table
order: [], // Default ordering (column index 0, descending)
columnDefs: [{
targets: '_all',
className: 'text-truncate'
}, // Apply truncation to all columns
],
language: {
paginate: {
next: '<i class="fas fa-angle-right"></i>', // Next button icon
@ -311,5 +336,4 @@ $(document).ready(function() {
$(document).ready(function() {
$('[data-toggle="tooltip"]').tooltip();
});
</script>

89
app/Views/Report_pending_purchase.php
View File

@ -11,14 +11,18 @@
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/1.4.2/css/buttons.dataTables.min.css">
<style>
th {
width:auto !important;
/* width: auto !important; */
}
table{
width:auto;
}
.dataTables_filter input {
padding: 4px;
}
.dataTables_filter {
width: 50%;
/* width: 50%; */
float: right;
text-align: right;
}
@ -167,19 +171,19 @@
<i class="fe-rotate-cw range_reset_button" aria-hidden="true" class="icon-button" id="resetButton" title="Reset"></i>
<div class="error" id="error"></div> -->
</form>
<table id="cc" class="table table-bordered table-hover" style="background-color:#fff;">
<table id="cc" class="table table-bordered table-hover wrap" style="background-color:#fff;width: 100% !important;">
<!-- <table class="table table-bordered table-hover" id="asset_list_table" style="background-color:#fff;font-size:12px;"> -->
<thead>
<tr>
<th style="text-align:center" >PO Date</th>
<th style="text-align:center">PO No</th>
<th style="text-align:center">Supplier Name</th>
<th style="text-align:center">Material Name</th>
<th style="text-align:center">Category</th>
<th style="text-align:center">Ordered Quantity</th>
<th style="text-align:center">Received Quantity</th>
<th style="text-align:center">Pending Quantity</th>
<th style="text-align:center, width:10%">PO Date</th>
<th style="text-align:center, width:14%">PO No</th>
<th style="text-align:center, width:15%">Supplier Name</th>
<th style="text-align:center, width:17%">Material Name</th>
<th style="text-align:center, width:10%">Category</th>
<th style="text-align:center, width:9%">Ordered Quantity</th>
<th style="text-align:center, width:9%">Received Quantity</th>
<th style="text-align:center, width:10%">Pending Quantity</th>
</tr>
</thead>
<tbody>
@ -419,9 +423,14 @@
'copy', 'csv', 'excel', 'pdf', 'print' // Export buttons
],
pageLength: 10, // Default rows per page
lengthMenu: [ [10, 20, 30, 50, -1], [10, 20, 30, 50, "All"] ], // Rows per page options
lengthMenu: [
[10, 20, 30, 50, -1],
[10, 20, 30, 50, "All"]
], // Rows per page options
responsive: true, // Responsive table
order: [[0, 'desc']], // Default ordering (column index 0, descending)
order: [
[0, 'desc']
], // Default ordering (column index 0, descending)
language: {
paginate: {
next: '<i class="fas fa-angle-right"></i>', // Next button icon
@ -439,40 +448,30 @@
});
$(function() {
//var dateFormat = "mm/dd/yy",
from = $("#min-date")
.datepicker({
dateFormat: "dd-mm-yy",
defaultDate: "+0d",
changeMonth: true,
//numberOfMonths: 1
var dateFormat = 'dd-mm-yyyy';
})
.on("change", function() {
to.datepicker("option", "minDate", getDate(this));
}),
to = $("#max-date").datepicker({
dateFormat: "dd-mm-yy",
defaultDate: "+0d",
changeMonth: true,
//numberOfMonths: 1
})
.on("change", function() {
from.datepicker("option", "maxDate", getDate(this));
// Initialize min-date (Start Date)
var from = $("#min-date").datepicker({
format: dateFormat,
autoclose: true,
todayHighlight: true,
clearBtn: true
}).on('changeDate', function(e) {
// When a date is selected in #min-date, update the minDate option for #max-date
// to.datepicker('setStartDate', e.date);
});
function getDate(element) {
var date;
try {
date = $.datepicker.parseDate(dateFormat, element.value);
} catch (error) {
date = null;
}
return date;
}
// Initialize max-date (End Date)
var to = $("#max-date").datepicker({
format: dateFormat,
// startDate: new Date(), // Start date cannot be in the past
autoclose: true,
todayHighlight: true,
clearBtn: true
}).on('changeDate', function(e) {
// When a date is selected in #max-date, update the endDate option for #min-date
from.datepicker('setStartDate', e.date);
});
});
</script>

3
app/Views/alterpurchaseorder.php
View File

@ -36,6 +36,9 @@ if (!empty($INRSYMBOL)) {
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.inputmask/3.3.4/jquery.inputmask.bundle.min.js"></script>
<style>
.txtSpcialInstruction{
background-color: #f4f9fb;
}
#packagingcalmodel {
margin-top: 200px;
z-index: 1080 !important;

2
app/Views/editCapitalPo.php
View File

@ -432,7 +432,7 @@
<?php } else { ?>
<h4><?= "Amended Capital Purchase Order - $PONO "; ?></h4>
<?php } ?>
<a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-success" id="back" value="Back">Back</a>
<a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-secondary" id="back" value="Back">Back</a>
</div>
</div>
</div>

68
app/Views/editRevenueAmendPO.php
View File

@ -409,7 +409,7 @@ if (!empty($INRSYMBOL)) {
$('#SGSTEditModel').removeAttr("style");
$('#IGSTViewModel').attr("style", "display:none;");
$('#SGSTViewModel').removeAttr("style");
$('#CGSTArea').attr("style", "display:block;");
$('#CGSTArea').attr("style", "display:flex;");
$('#IGSTAddModel').attr("style", "display:none;");
$('#SGSTAddModel').removeAttr("style");
$('#CGSTshow').attr("style", "display:block;");
@ -959,7 +959,7 @@ if (!empty($INRSYMBOL)) {
endforeach;
}
echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier" required="true" class="form-control select2" disabled readonly');
echo form_dropdown('drpSupplier', $options, set_value('drpSupplier', $SupId), 'id="drpSupplier" required="true" class="form-control select2" readonly');
?>
</div>
@ -1613,7 +1613,7 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
<div class="form-group col-md-1">
<div class="form-group col-md-2">
<label>UOM</label>
<div>
<?php
@ -1622,7 +1622,9 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
<div class="form-group col-md-2">
<div class="form-group col-md-6">
<div class="form-row">
<div class="form-group col-md-3">
<label>Quantity<span class="text-danger">*</span></label>
<div>
<?php
@ -1632,7 +1634,7 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<div class="form-group col-md-2">
<div class="form-group col-md-3">
<label>Rate <?php echo "($INRSYM)" ?><span class="text-danger">*</span></label>
<div>
<?php
@ -1641,12 +1643,12 @@ if (!empty($INRSYMBOL)) {
?>
</div>
</div>
<div class="form-group col-md-1">
<div class="form-group col-md-3">
<label>Per</label> <?php
$data = array('name' => 'EditAmendPer', 'value' => set_value('EditAmendPer'), 'id' => 'EditAmendPer', 'class' => 'form-control');
echo form_input($data); ?>
</div>
<div class="form-group col-md-2" style="padding-left: 0px;">
<div class="form-group col-md-3" style="padding-left: 0px;">
<label>Basic Amt <?php echo "($INRSYM)" ?></label>
<div>
<?php
@ -1656,6 +1658,8 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4"></div>
@ -1885,7 +1889,7 @@ if (!empty($INRSYMBOL)) {
</div>
</div>
<div class="modal-footer">
<a class="btn btn-success" data-dismiss="modal" value="Cancel">Cancel</a>
<a class="btn btn-success" data-dismiss="modal" value="Cancel" style="margin:10px;">Cancel</a>
<a class="btn btn-success EditRevenue" ID="EditRevenue">&nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
</div>
</form>
@ -2006,12 +2010,10 @@ if (!empty($INRSYMBOL)) {
</tr>
</script> -->
<script>
$(document).ready(function() {
var index = '1';
var userid = '';
$('#BudgetType').attr("style", "pointer-events: none;");
$("#EDITREVENUE").on("shown.bs.modal", function(e) {
var AvlBudAmt = '<?php echo $AvlAmount ?>';
@ -2063,10 +2065,6 @@ if (!empty($INRSYMBOL)) {
$('#txtEditInsurance').val($('#Insval' + userid).val());
$('#txtEditTotalOrderValue').val($('#TotalOrderValue' + userid).val());
$("#EditMaterialCode").empty();
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
// For Binding Material list center for the selected Requistion Number
@ -2074,52 +2072,34 @@ if (!empty($INRSYMBOL)) {
var isAdded = "0";
for (i = 0; i < Material.length; i++) {
$.each(Material[i], function(idx, obj) {
if (obj.ReqNo === id) {
$.each(SelectedMaterialList.Mat, function(idx1, el) {
if (id == el.ReqNo) {
if (el.materialCode == obj.MaterialCode) {
isAdded = "1";
return false;
} else {
isAdded = "0";
}
}
});
if (isAdded == "0") {
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
}
}
});
}
$("#EditDiscountType").val($('#DisType' + userid).val());
$("#drpEditFreight").val($('#FreightType' + userid).val());
$("#EditPackagingType").val($('#PackType' + userid).val())
$("input:radio[name='optPackaging'][value='" + $('#PackOption' + userid).val() + "']").prop('checked', 'checked');
$("input:radio[name='optExcise'][value='" + $('#ExciseOption' + userid).val() + "']").prop('checked', 'checked');
$("input:radio[name='optVat'][value='" + $('#VatOption' + userid).val() + "']").prop('checked', 'checked');
$("input:radio[name='optCST'][value='" + $('#CSTOption' + userid).val() + "']").prop('checked', 'checked');
});
$('#BudgetType').attr("style", "pointer-events: none;");
$('.editrevenue').click(function() {
$('#EditRevenue').click(function() {
// alert('inside Functioon');
tinyMCE.triggerSave();
@ -2180,9 +2160,11 @@ if (!empty($INRSYMBOL)) {
// console.log(userid);
var tr = document.getElementById(userid);
var cellval = tr.cells;
// console.log(tr);
cellval[2].innerHTML = editDescription;
cellval[3].innerHTML = parseFloat(editQuantity).toFixed(2);
@ -2192,7 +2174,7 @@ if (!empty($INRSYMBOL)) {
cellval[7].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
cellval[8].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
// alert("late");
$('#materialCode' + userid).val(editMaterialCode);
$('#materialName' + userid).val(editDescription);
$('#uom' + userid).val(editUOM);
@ -2230,9 +2212,12 @@ if (!empty($INRSYMBOL)) {
$('#costCode' + userid).val(CostCode);
$('#TotalOrderValue' + userid).val(TotalOrderValue);
$('#service_description' + userid).val(Service_Description);
populateValueMainFormForEditRevenueTax();
setTimeout(() => {
$('#EDITREVENUE').modal('hide');
}, 1000);
}
// alert('outside IF');
});
@ -2371,6 +2356,7 @@ if (!empty($INRSYMBOL)) {
return true;
}
}
})
</script>
<script>
function validateBudgetExceedLimit() {
@ -2455,7 +2441,7 @@ if (!empty($INRSYMBOL)) {
// }
else {
//alert('final else for store data');
$('.content').loader('show');
// $('.content').loader('show');
var formData = new FormData($('.CreatePO')[0]);
$.ajax({
@ -2467,7 +2453,7 @@ if (!empty($INRSYMBOL)) {
contentType: false,
success: function(data) {
if (data) {
$('.content').loader('hide');
// $('.content').loader('hide');
alert(data);
$('#txtRowCount').val('');
$('#txtDeletedRow').val('');
@ -2477,7 +2463,7 @@ if (!empty($INRSYMBOL)) {
window.location = "amendmentpurchaseorder";
} else {
$('.content').loader('hide');
// $('.content').loader('hide');
alert("Error");
}

182
app/Views/editRevenuepurchaseorder.php
View File

@ -2183,14 +2183,14 @@ if (!empty($getlogpodtl)) {
<td><?php echo $record->ReqNo ?></td>
<td><?php echo $record->MaterialCode ?></td>
<td><?php echo $record->MaterialName ?></td>
<td align="right"><?php echo $record->Quantity ?></td>
<td align="left"><?php echo $record->Quantity ?></td>
<td><?php echo $record->UOM ?></td>
<td align="right"><?php echo $record->Rate ?></td>
<td align="left"><?php echo $record->Rate ?></td>
<td align="right"><?php echo number_format($record->BasicValue, 2, '.', ''); ?></td>
<td align="left"><?php echo number_format($record->BasicValue, 2, '.', ''); ?></td>
<td align="right"><?php echo $record->Taxamount ?></td>
<td align="right"><?php echo $record->TotalValue ?></td>
<td align="left"><?php echo $record->Taxamount ?></td>
<td align="left"><?php echo $record->TotalValue ?></td>
<!-- <td align="right"><?php echo $record->Quantity ?></td>
<td align="right"><?php echo $record->ReceivedQuantity ?></td>
<td align="right"><?php echo number_format($record->Quantity - $record->ReceivedQuantity, 2, '.', ''); ?></td> -->
@ -2262,7 +2262,8 @@ if (!empty($getlogpodtl)) {
}
?>
</tbody>
</table><br></div>
</table><br>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-3">
@ -4454,8 +4455,7 @@ $('#RevenueAppend').append(rowHtml);
$('#ViewAfterIGST').val(TAXval);
return TAXval; // $('#AfterServiceTax').val(TAXval);
}
</script>
<script>
function validateBudgetExceedLimit() {
var rows = document.getElementById('revenueTax').rows.length;
var ReqType = '<?php echo REVENUE ?>';
@ -4635,82 +4635,6 @@ $('#RevenueAppend').append(rowHtml);
}
function Save(status) {
if (status == '0') {
stat = '<?php echo PO_DRAFT; ?>';
} else if (status == '1') {
stat = '<?php echo PO_CREATED; ?>';
} else if (status == '4') {
stat = '<?php echo PO_RELEASED; ?>';
} else {
stat = '<?php echo $PONOStatus; ?>';
}
var deladd = $('#DeliveryAddr').val();
$('#txtStatus').val(stat);
tinyMCE.triggerSave();
var splinstr = $('#txtSpcialInstruction').val();
$('#SpcialInstruction').val(splinstr);
$('#txtDeliveryAddress').val(deladd);
var AvlBudAmt = '<?php echo number_format($AvlAmount + $totBasicAmt - $totDiscountAmt, 2, '.', '') ?>';
var txtTotalbasicamount = $('#txtTotBasicAmount').val();
var totaldiscount = $('#txtTotalDiscount').val();
//alert(txtTotalbasicamount+'-'+totaldiscount);
//alert(txtTotalbasicamount-totaldiscount);
if (validate()) {
if (document.getElementById('revenueTax').rows.length < 2) {
alert('Please Select Line item to Create PO');
$('#Deliverydt').focus();
return false;
}
//else if(validateBudgetExceedLimit())
//{
// return false;
//}
// else if(parseInt(AvlBudAmt) < (parseInt(txtTotalbasicamount)- parseInt(totaldiscount))){
// alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
// return false;
// }
else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') {
alert('Please Enter Payable Terms Description');
$('#Otherpayment').focus();
return false;
} else if ($('#insurancestatus').val() == 1 && $('#InsuranceNumber').val() == '') {
alert('Please Enter Insurance No / Insurance Details..!');
$('#insurance').focus();
return false;
} else {
var formData = new FormData($('.CreatePO')[0]);
$.ajax({
type: "POST",
url: "<?php echo base_url() ?>purchaseorder/EditRevenuePurchaseOrder",
data: formData,
processData: false,
contentType: false,
success: function(data) {
if (data) {
alert(data);
$('#txtRowCount').val('');
$('#txtDeletedRow').val('');
$('#txtStatus').val('');
$('#SpcialInstruction').val('');
$('#txtDeliveryAddress').val('')
window.location = "purchaseorderListing";
} else {
alert("Error");
}
},
error: function(jqXHR, textStatus, errorThrown) {
console.error("AJAX Error: " + textStatus + ": " + errorThrown);
alert("Error: " + textStatus);
}
});
}
}
}
// this function is used to clear data changing schedule option
$('#Scheduleby').change(function() {
@ -4906,8 +4830,88 @@ $('#RevenueAppend').append(rowHtml);
id = '';
});
$(document).ready(function() {
function Save(status) {
console.log("status");
console.log(status);
if (status == '0') {
stat = '<?php echo PO_DRAFT; ?>';
} else if (status == '1') {
stat = '<?php echo PO_CREATED; ?>';
} else if (status == '4') {
stat = '<?php echo PO_RELEASED; ?>';
} else {
stat = '<?php echo $PONOStatus; ?>';
}
var deladd = $('#DeliveryAddr').val();
$('#txtStatus').val(stat);
tinyMCE.triggerSave();
var splinstr = $('#txtSpcialInstruction').val();
$('#SpcialInstruction').val(splinstr);
$('#txtDeliveryAddress').val(deladd);
var AvlBudAmt = '<?php echo number_format($AvlAmount + $totBasicAmt - $totDiscountAmt, 2, '.', '') ?>';
var txtTotalbasicamount = $('#txtTotBasicAmount').val();
var totaldiscount = $('#txtTotalDiscount').val();
//alert(txtTotalbasicamount+'-'+totaldiscount);
//alert(txtTotalbasicamount-totaldiscount);
if (validate()) {
if (document.getElementById('revenueTax').rows.length < 2) {
alert('Please Select Line item to Create PO');
$('#Deliverydt').focus();
return false;
}
//else if(validateBudgetExceedLimit())
//{
// return false;
//}
// else if(parseInt(AvlBudAmt) < (parseInt(txtTotalbasicamount)- parseInt(totaldiscount))){
// alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
// return false;
// }
else if ($('#Otherpayment').val() == '' && $('#PaymentTerms').val() == 'PT08') {
alert('Please Enter Payable Terms Description');
$('#Otherpayment').focus();
return false;
} else if ($('#insurancestatus').val() == 1 && $('#InsuranceNumber').val() == '') {
alert('Please Enter Insurance No / Insurance Details..!');
$('#insurance').focus();
return false;
} else {
var formData = new FormData($('.CreatePO')[0]);
$.ajax({
type: "POST",
url: "<?php echo base_url() ?>purchaseorder/EditRevenuePurchaseOrder",
data: formData,
processData: false,
contentType: false,
success: function(data) {
console.log(data);
// if (data) {
// alert(data);
// $('#txtRowCount').val('');
// $('#txtDeletedRow').val('');
// $('#txtStatus').val('');
// $('#SpcialInstruction').val('');
// $('#txtDeliveryAddress').val('')
// window.location = "purchaseorderListing";
// } else {
// alert("Error");
// }
},
error: function(jqXHR, textStatus, errorThrown) {
console.error("AJAX Error: " + textStatus + ": " + errorThrown);
alert("Error: " + textStatus);
}
});
}
}
}
$(document).ready(function() {
$("#EDITREVENUE").on("shown.bs.modal", function(e) {
var AvlBudAmt = '<?php echo $AvlAmount ?>';
@ -5123,6 +5127,7 @@ $('#RevenueAppend').append(rowHtml);
processData: false,
success: function(data) {
if (data) {
console.log(data);
alert(data);
window.location.reload();
// $('#spl').find('td').eq(5).text(filename[2]);
@ -5166,6 +5171,7 @@ $('#RevenueAppend').append(rowHtml);
processData: false,
success: function(data) {
if (data) {
console.log(data);
alert(data);
window.location.reload();
// $('#spl').find('td').eq(5).text(filename[2]);
@ -5199,6 +5205,7 @@ $('#RevenueAppend').append(rowHtml);
processData: false,
success: function(data) {
if (data) {
console.log(data);
alert(data);
window.location.reload();
// $('#spl').find('td').eq(5).text(filename[2]);
@ -5219,16 +5226,11 @@ $('#RevenueAppend').append(rowHtml);
$('#billimag').val('');
}
}
</script>
<script>
var counter = 0;
//var counterConstant = 0;
$("#addmorebutton").click(function() {
counter++;

8
app/Views/editimportpo.php
View File

@ -370,7 +370,7 @@ if (!empty($getlogpodtl)) {
<?php } else { ?>
<h4><?= "Amended Import Purchase Order - $PONO "; ?></h4>
<?php } ?>
<a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-success" id="back" value="Back">Back</a>
<a href="<?php echo base_url() ?>purchaseorderListing" class="btn btn-secondary" id="back" value="Back">Back</a>
</div>
</div>
</div>
@ -5338,7 +5338,7 @@ if (!empty($getlogpodtl)) {
url: "<?php echo base_url() ?>purchaseorder/DeletePODetails",
success: function(data) {
if (data) {
$('#content').loader('hide');
// $('#content').loader('hide');
alert(data);
} else {
alert("Error");
@ -5512,7 +5512,7 @@ if (!empty($getlogpodtl)) {
return false;
} else {
//alert();
$('#content').loader('show');
// $('#content').loader('show');
var formData = new FormData($('.ImportPO')[0]);
formData.append('txtRowCount', Row);
formData.append('txtDeletedRow', txtDeletedRow);
@ -5527,7 +5527,7 @@ if (!empty($getlogpodtl)) {
url: "<?php echo base_url() ?>purchaseorder/EditImportPurchaseOrder",
success: function(data) {
if (data) {
$('#content').loader('hide');
// $('#content').loader('hide');
alert(data);
$('#txtRowCount').val('');
$('#txtDeletedRow').val('');

494
app/Views/importpo.php
View File

@ -13,7 +13,6 @@ $Terms = '';
$t = '';
if (!empty($staticspecialinstruction)) {
$t = $staticspecialinstruction[0]->ConfigValue;
}
@ -81,49 +80,200 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<script>
$(document).ready(function() {
$("#PaymentTerms").select2();
$('#drpSupplier').change(function() {
var id = $('#drpSupplier').val();
$("#SupAddress").val('');
if (id != '0') {
var y = <?php echo json_encode($Suplist, JSON_PRETTY_PRINT) ?>;
var Payment = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
var PaymentID = '';
$('#PaymentTerms').empty();
$.each(y, function(idx, obj) {
if (obj.SupplierID === id) {
if (obj.MSME) {
$("#SupAddress").val("MSME : " + obj.MSME + "\n" + obj.Address);
} else {
$("#SupAddress").val(obj.Address);
}
PaymentID = obj.PaymentID;
//PaymentID = obj.PaymentID;
$('#PaymentTerms').val(obj.PaymentTerms);
}
});
if (PaymentID == 'PT08') {
$('#otheroptiondiv').show();
$('#Otherpayment').val('');
} else {
$('#otheroptiondiv').hide();
$('#Otherpayment').show();
}
$('#PaymentTerms').empty();
var paymentList = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
$.each(paymentList, function(pay, payobj)
{
if (payobj.PaymentID == PaymentID) {
$("#PaymentTerms").append($('<option></option>').val(payobj.PaymentID).html(payobj.PaymentTerms));
}
// else
// {
// // $("#PaymentTerms").append( $('<option></option>').val(payobj.PaymentID).html(payobj.PaymentTerms));
// }
});
$.each(Payment, function(pay, payobj) {
if (payobj.PaymentID == PaymentID) {
} else {
$("#PaymentTerms").append($('<option></option>').val(payobj.PaymentID).html(payobj.PaymentTerms));
}
});
} else {
alert('Please select the SupplierID');
return false;
}
});
$("#editimportpomodel").on("shown.bs.modal", function(e) {
userid = $(e.relatedTarget).data('userid');
var tr = document.getElementById(userid);
var cellval = tr.cells;
var id = $('#Reqnumber' + userid).val();
$('#EditReqNo').val($('#Reqnumber' + userid).val());
$('#EditdeptName').val($('#departmentName' + userid).val());
$("#EditCostCenter").val($('#costCode' + userid).val());
$('#EditAvlBudAmt').val($('#AvilBudget' + userid).val());
$('#EditItemName').val($('#materialName' + userid).val());
$('#EditUOM').val($('#uom' + userid).val());
var uom = parseFloat($('#uom' + userid).val());
$('#EditQuantity').val($('#quantity' + userid).val());
RequistQuantity = $('#quantity' + userid).val();
var editrate = parseFloat($('#itemRate' + userid).val()).toFixed(2);
$('#EditRate').val(editrate);
//$('#EditRate').val($('#itemRate'+userid).val());
var basic = parseFloat($('#BasicAmt' + userid).val()).toFixed(2);
//$('#EdittxtBasicValue').val($('#BasicAmt'+userid).val());
//$('#EditimBasicPrice').val($("#BasicAmt"+userid).val());
$('#EdittxtBasicValue').val(basic);
$('#EditimBasicPrice').val(basic);
var inrbasicval = parseFloat($('#BasicPriceINR' + userid).val()).toFixed(2);
// $('#EditINRBasicvalue').val($("#BasicPriceINR"+userid).val());
$('#EditINRBasicvalue').val(inrbasicval);
$('#EditLandingCharge').val($("#LandingChargee" + userid).val());
$('#EditAfterLandingCharge').val($("#AfterLandingChargee" + userid).val());
$('#EditAfterAssessable').val($("#AfterAssessable" + userid).val());
$('#EditCustomduty').val($("#Customduty" + userid).val());
$('#EditAfterCustomduty').val($("#AfterCustomduty" + userid).val());
$('#EditCustomEDcess').val($("#CustomEDcess" + userid).val());
$('#EditAfterCustomEDcess').val($("#AfterCustomEDcess" + userid).val());
$('#EditCustomSHcess').val($("#CustomSHcess" + userid).val());
$('#EditAfterCustomSHcess').val($("#AfterCustomSHcess" + userid).val());
$('#EditSubtotal').val($("#Subtotal" + userid).val());
$('#EditIgst').val($("#Igst" + userid).val());
$('#EditAfterIgst').val($("#AfterIgst" + userid).val());
$('#EditGrossdutypayable').val($("#Grossdutypayable" + userid).val());
$('#EditGrossexpenses').val($("#Grossexpenses" + userid).val());
$('#EditPurQuantity').val($("#PurQuantity" + userid).val());
$('#EditCustomDutyExpenses').val($("#CustomDutyExpenses" + userid).val());
$('#EditDutyImpact').val($("#Dutyimpact" + userid).val());
$('#EditClearingCharges').val($("#ClearingCharges" + userid).val());
$('#EditNett').val($("#Nett" + userid).val());
var basicinr = parseFloat($('#AfterBasicPriceTax' + userid).val()).toFixed(2);
// $('#EditAfterBasicPriceTax').val($("#AfterBasicPriceTax"+userid).val());
$('#EditAfterBasicPriceTax').val(basicinr);
$('#EditTotalExp').val($("#TotalExp" + userid).val());
$('#drpeditFreight').val($('#FreightType' + userid).val());
$('#editNOOfTrips').val($('#NoofTrip' + userid).val());
$('#txtEditFreight').val($('#FreightRate' + userid).val());
$('#edittxtAfterFreight').val($('#AfterFreightRate' + userid).val());
//$('#edittxtInstruction').val($('#Addinstruction'+userid).val());
tinyMCE.get('edittxtInstruction').setContent($('#Addinstruction' + userid).val());
var FreightType = $('#drpeditFreight').val();
if (FreightType == "PER TRIP") {
$('#editTripsValue').show();
} else { //alert();
$('#editTripsValue').hide();
}
$('#EditPer').val($('#Per' + userid).val());
$('#EditTotalOrderValue').val(cellval[8].innerHTML);
$("#EditMaterialCode").empty();
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
var isAdded = "0";
for (i = 0; i < Material.length; i++) {
$.each(Material[i], function(idx, obj) {
if (obj.ReqNo === id) {
$.each(SelectedMaterialList.Mat, function(idx1, el) {
if (id == el.ReqNo) {
if (el.materialCode == obj.MaterialCode) {
isAdded = "1";
return false;
} else {
isAdded = "0";
}
}
});
if (isAdded == "0") {
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
}
}
});
}
});
$("#PaymentTerms").select2();
tinymce.init({
selector: "textarea#txtSpcialInstruction",
menubar: false,
statusbar: false,
toolbar: false,
setup: function(ed) {
ed.on('init', function(evt) {
ed.setContent('<?php echo $t; ?>');
});
}
});
tinymce.init({
selector: "textarea#addtxtInstruction",
menubar: false,
statusbar: false,
toolbar: false
});
tinymce.init({
selector: "textarea#edittxtInstruction",
menubar: false,
statusbar: false,
toolbar: false
});
//Initialize Select2 Elements for currency type
$("#currencytype").select2();
var POMaxDate = '<?php echo $MaxPoDate; ?>';
var d = new Date(POMaxDate);
var t = '<?php echo $CurrentDate; ?>';
var m = new Date(t);
$("#PODate").datepicker({
minDate: d,
maxDate: 'now',
@ -250,7 +400,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4><?= "Import Purchase Order"; ?></h4>
<a href="<?php echo base_url() ?>CreatePO" class="btn btn-success" id="back" value="Back">Back</a>
<a href="<?php echo base_url() ?>CreatePO" class="btn btn-secondary" id="back" value="Back">Back</a>
</div>
</div>
</div>
@ -267,6 +417,7 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<div class="form-row">
<div class="form-group col-md-3">
<label>Requistion No</label>
<div>
<?php
$options = array("0" => 'Selected Requisition Numbers');
@ -278,10 +429,11 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
$ReqType = $SID->ReqType;
endforeach;
}
echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo" required="true"');
echo form_multiselect('RequistionNo', $options, set_value('RequistionNo', array()), 'id="RequistionNo" class="form-control" required="true"');
?>
</div>
</div>
<div class="form-group col-md-3">
<label>Purchase Order Type</label>
<div>
@ -693,8 +845,14 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
<label>Special Instructions :</label>
<?php
$data = array('name' => 'txtSpcialInstruction', 'value' => set_value(field: 'txtSpcialInstruction'),
'id' => 'txtSpcialInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
$data = array(
'name' => 'txtSpcialInstruction',
'value' => set_value(field: 'txtSpcialInstruction'),
'id' => 'txtSpcialInstruction',
'class' => 'form-control',
'rows' => '10',
'cols' => '40'
);
echo form_textarea(data: $data);
?>
</div>
@ -1333,15 +1491,13 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
</div>
<div class="form-row mt-3">
<div class="form-row">
<label style="text-align: left;">Import Description :</label>
<div class="form-group col-md-4" style="margin-top:10px;">
<label>Import Description </label>
<?php
$data = array('name' => 'addtxtInstruction', 'value' => set_value('addtxtInstruction'), 'id' => 'addtxtInstruction', 'class' => 'form-control', 'rows' => '10', 'cols' => '40');
echo form_textarea($data);
?>
</div>
</div>
</div>
</div>
@ -2054,84 +2210,6 @@ if (isset($AvlimportBudAmt) && !empty($AvlimportBudAmt)) {
$('#drpSupplier').change(function() {
var id = $('#drpSupplier').val();
$("#SupAddress").val('');
if (id != '0') {
var y = <?php echo json_encode($Suplist, JSON_PRETTY_PRINT) ?>;
var Payment = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
var PaymentID = '';
$('#PaymentTerms').empty();
$.each(y, function(idx, obj) {
if (obj.SupplierID === id) {
if (obj.MSME) {
$("#SupAddress").val("MSME : " + obj.MSME + "\n" + obj.Address);
} else {
$("#SupAddress").val(obj.Address);
}
PaymentID = obj.PaymentID;
//PaymentID = obj.PaymentID;
$('#PaymentTerms').val(obj.PaymentTerms);
}
});
if (PaymentID == 'PT08') {
$('#otheroptiondiv').show();
$('#Otherpayment').val('');
} else {
$('#otheroptiondiv').hide();
$('#Otherpayment').show();
}
$('#PaymentTerms').empty();
var paymentList = <?php echo json_encode($Payment, JSON_PRETTY_PRINT) ?>;
$.each(paymentList, function(pay, payobj)
{
if (payobj.PaymentID == PaymentID) {
$("#PaymentTerms").append($('<option></option>').val(payobj.PaymentID).html(payobj.PaymentTerms));
}
// else
// {
// // $("#PaymentTerms").append( $('<option></option>').val(payobj.PaymentID).html(payobj.PaymentTerms));
// }
});
$.each(Payment, function(pay, payobj) {
if (payobj.PaymentID == PaymentID) {
} else {
$("#PaymentTerms").append($('<option></option>').val(payobj.PaymentID).html(payobj.PaymentTerms));
}
});
} else {
alert('Please select the SupplierID');
return false;
}
});
$('#currencytype').change(function() {
$('#ExchangeRate').val('');
});
@ -3481,11 +3559,12 @@ $('#ImportAppend').append(rowHtml);
//addHidden(theForm,"AfterBasicPriceTax"+temp,AfterBasicPriceTax);
$('#txtRowCount').val(temp);
clearTaxField();
$('#IMPORT').modal('hide');
setTimeout(() => {
alert('Line Item Added SuccesFully..');
}, 1000);
}
});
@ -3599,10 +3678,10 @@ $('#ImportAppend').append(rowHtml);
function clearTaxField() {
//$('#AfterBasicPriceTax').val('');
// $('#ReqNo').val('');
//$('#deptName').val('');
//$('#CostCenter').val('');
//$('#AvlBudAmt').val('');
$('#ReqNo').val('');
$('#deptName').val('');
$('#CostCenter').val('');
$('#AvlBudAmt').val('');
$('#MaterialCode').val('');
$('#ItemName').val('');
$('#UOM').val('');
@ -3641,18 +3720,11 @@ $('#ImportAppend').append(rowHtml);
$('#purchaserate').val('');
$('#CustomDutyExpenses').val('');
$('#RMCIncludingCustomers').val('');
$('#drpFreight').val('');
$('#NOOfTrips').val('');
$('#txtFreight').val('');
$('#txtAfterFreight').val('');
$('#AddPer').val('');
$('#AfterAssessable').val('');
$('#Subtotal').val('');
$('#Igst').val(0);
@ -3660,153 +3732,11 @@ $('#ImportAppend').append(rowHtml);
$('#DutyImpact').val('');
$('#ClearingCharges').val('');
$('#Nett').val('');
//$('#addtxtInstruction').val('');
tinymce.get('addtxtInstruction').setContent('');
}
$("#editimportpomodel").on("shown.bs.modal", function(e) {
userid = $(e.relatedTarget).data('userid');
//alert(userid);
//alert('inadd');
var tr = document.getElementById(userid);
//alert(tr);
var cellval = tr.cells;
//alert(cellval);
var id = $('#Reqnumber' + userid).val();
//alert(id);
$('#EditReqNo').val($('#Reqnumber' + userid).val());
//alert($('#Reqnumber'+userid).val());
$('#EditdeptName').val($('#departmentName' + userid).val());
$("#EditCostCenter").val($('#costCode' + userid).val());
$('#EditAvlBudAmt').val($('#AvilBudget' + userid).val());
$('#EditItemName').val($('#materialName' + userid).val());
$('#EditUOM').val($('#uom' + userid).val());
var uom = parseFloat($('#uom' + userid).val());
//console.log(uom);
$('#EditQuantity').val($('#quantity' + userid).val());
RequistQuantity = $('#quantity' + userid).val();
var editrate = parseFloat($('#itemRate' + userid).val()).toFixed(2);
// console.log(editrate);
$('#EditRate').val(editrate);
//$('#EditRate').val($('#itemRate'+userid).val());
var basic = parseFloat($('#BasicAmt' + userid).val()).toFixed(2);
//console.log(basic);
//$('#EdittxtBasicValue').val($('#BasicAmt'+userid).val());
//$('#EditimBasicPrice').val($("#BasicAmt"+userid).val());
$('#EdittxtBasicValue').val(basic);
$('#EditimBasicPrice').val(basic);
var inrbasicval = parseFloat($('#BasicPriceINR' + userid).val()).toFixed(2);
// $('#EditINRBasicvalue').val($("#BasicPriceINR"+userid).val());
$('#EditINRBasicvalue').val(inrbasicval);
$('#EditLandingCharge').val($("#LandingChargee" + userid).val());
$('#EditAfterLandingCharge').val($("#AfterLandingChargee" + userid).val());
$('#EditAfterAssessable').val($("#AfterAssessable" + userid).val());
$('#EditCustomduty').val($("#Customduty" + userid).val());
$('#EditAfterCustomduty').val($("#AfterCustomduty" + userid).val());
$('#EditCustomEDcess').val($("#CustomEDcess" + userid).val());
$('#EditAfterCustomEDcess').val($("#AfterCustomEDcess" + userid).val());
$('#EditCustomSHcess').val($("#CustomSHcess" + userid).val());
$('#EditAfterCustomSHcess').val($("#AfterCustomSHcess" + userid).val());
$('#EditSubtotal').val($("#Subtotal" + userid).val());
$('#EditIgst').val($("#Igst" + userid).val());
$('#EditAfterIgst').val($("#AfterIgst" + userid).val());
$('#EditGrossdutypayable').val($("#Grossdutypayable" + userid).val());
$('#EditGrossexpenses').val($("#Grossexpenses" + userid).val());
$('#EditPurQuantity').val($("#PurQuantity" + userid).val());
$('#EditCustomDutyExpenses').val($("#CustomDutyExpenses" + userid).val());
$('#EditDutyImpact').val($("#Dutyimpact" + userid).val());
$('#EditClearingCharges').val($("#ClearingCharges" + userid).val());
$('#EditNett').val($("#Nett" + userid).val());
var basicinr = parseFloat($('#AfterBasicPriceTax' + userid).val()).toFixed(2);
// $('#EditAfterBasicPriceTax').val($("#AfterBasicPriceTax"+userid).val());
$('#EditAfterBasicPriceTax').val(basicinr);
$('#EditTotalExp').val($("#TotalExp" + userid).val());
$('#drpeditFreight').val($('#FreightType' + userid).val());
$('#editNOOfTrips').val($('#NoofTrip' + userid).val());
$('#txtEditFreight').val($('#FreightRate' + userid).val());
$('#edittxtAfterFreight').val($('#AfterFreightRate' + userid).val());
//$('#edittxtInstruction').val($('#Addinstruction'+userid).val());
tinyMCE.get('edittxtInstruction').setContent($('#Addinstruction' + userid).val());
var FreightType = $('#drpeditFreight').val();
if (FreightType == "PER TRIP") {
$('#editTripsValue').show();
} else { //alert();
$('#editTripsValue').hide();
}
$('#EditPer').val($('#Per' + userid).val());
$('#EditTotalOrderValue').val(cellval[8].innerHTML);
$("#EditMaterialCode").empty();
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
$("#EditMaterialCode").append($('<option></option>').val($('#materialCode' + userid).val()).html($('#materialCode' + userid).val() + "-" + $('#materialName' + userid).val()));
var isAdded = "0";
for (i = 0; i < Material.length; i++) {
$.each(Material[i], function(idx, obj) {
if (obj.ReqNo === id) {
$.each(SelectedMaterialList.Mat, function(idx1, el) {
if (id == el.ReqNo) {
if (el.materialCode == obj.MaterialCode) {
isAdded = "1";
return false;
} else {
isAdded = "0";
}
}
});
if (isAdded == "0") {
$("#EditMaterialCode").append($('<option></option>').val(obj.MaterialCode).html(obj.MaterialCode + "-" + obj.MaterialName));
}
}
});
}
});
$('.EditImport').click(function() {
//alert('inside edit');
if (validateEditExceedLimit() && ExceedEditQuantityCheck() && EditQtyZerocheck()) {
var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val();
@ -3814,7 +3744,6 @@ $('#ImportAppend').append(rowHtml);
var edititemname = $("#EditItemName").val();
var editUOM = $('#EditUOM').val();
var editQuantity = $('#EditQuantity').val();
//console.log(editQuantity);
var itemRate = $("#EditRate").val();
var BasicValue = $("#EdittxtBasicValue").val();
var BasicPriceinUS = $('#EditimBasicPrice').val();
@ -3824,21 +3753,16 @@ $('#ImportAppend').append(rowHtml);
var AfterBasicPrice = $("#EditAfterBasicPriceTax").val();
var Landingcharge = $("#EditLandingCharge").val();
var AfterLanding = $("#EditAfterLandingCharge").val();
var CustomDuty = $("#EditCustomduty").val();
var AfterCustomDuty = $("#EditAfterCustomduty").val();
var CustomED = $("#EditCustomEDcess").val();
var AfterCustomED = $("#EditAfterCustomEDcess").val();
var CustomSH = $("#EditCustomSHcess").val();
var AfterCustomSH = $("#EditAfterCustomSHcess").val();
var GrossDuty = $("#EditGrossdutypayable").val();
var PurchaseRate = $("#Editpurchaserate").val();
var Quantity = $("#EditPurQuantity").val();
var CustomDutyExpense = $("#EditCustomDutyExpenses").val();
var Igst = $('#EditIgst').val();
var AfterIgst = $('#EditAfterIgst').val();
var Dutyimpact = $('#EditDutyImpact').val();
@ -3848,11 +3772,8 @@ $('#ImportAppend').append(rowHtml);
//console.log(assessble);
var Subtotal = $('#EditSubtotal').val();
var TotalExp = $('#EditTotalExp').val();
var FreightType = $('#drpeditFreight').val();
var FreightRate = $('#txtEditFreight').val();
var FreightRateAmount = $('#edittxtAfterFreight').val();
@ -3860,30 +3781,16 @@ $('#ImportAppend').append(rowHtml);
var per = $('#EditPer').val();
var spclins = $.trim(tinymce.get('edittxtInstruction').getContent());
//console.log(spclins);
if (per == '') {
per = $('#EditUOM').val();
}
var FreightTypename = $('#drpeditFreight').val();
if (FreightTypename != "PER TRIP") {
Nooftrip = '';
}
// console.log(FreightType);
// console.log(FreightRate);
// console.log(FreightRateAmount);
// console.log(Nooftrip);
var tr = document.getElementById(userid);
var cellval = tr.cells;
cellval[4].innerHTML = editQuantity;
cellval[5].innerHTML = editUOM;
cellval[6].innerHTML = itemRate;
@ -3901,22 +3808,15 @@ $('#ImportAppend').append(rowHtml);
$('#AfterBasicPriceTax' + userid).val(AfterBasicPrice);
$('#LandingChargee' + userid).val(Landingcharge);
$('#AfterLandingChargee' + userid).val(AfterLanding);
$('#Customduty' + userid).val(CustomDuty);
$('#AfterCustomduty' + userid).val(AfterCustomDuty);
$('#CustomEDcess' + userid).val(CustomED);
$('#AfterCustomEDcess' + userid).val(AfterCustomED);
$('#CustomSHcess' + userid).val(CustomSH);
$('#AfterCustomSHcess' + userid).val(AfterCustomSH);
$('#Grossdutypayable' + userid).val(GrossDuty);
$('#PurQuantity' + userid).val(Quantity);
$('#CustomDutyExpenses' + userid).val(CustomDutyExpense);
$('#Igst' + userid).val(Igst);
$('#AfterIgst' + userid).val(AfterIgst);
$('#Dutyimpact' + userid).val(Dutyimpact);
@ -3924,44 +3824,27 @@ $('#ImportAppend').append(rowHtml);
$('#Nett' + userid).val(Nett);
$('#CustomDutyExpenses' + userid).val(CustomDutyExpense);
$('#Subtotal' + userid).val(Subtotal);
$('#TotalExp' + userid).val(TotalExp);
$('#TotalValue' + userid).val(TotalExp);
$('#FreightType' + userid).val(FreightType);
$('#NoofTrip' + userid).val(Nooftrip);
$('#FreightRate' + userid).val(FreightRate);
$('#AfterFreightRate' + userid).val(FreightRateAmount);
$('#Per' + userid).val(per);
$('#Addinstruction' + userid).val(spclins);
//var a=$('#quantity'+userid).val();
// var b=$('#NoofTrip'+userid).val();
// var c=$('#FreightRate'+userid).val();
// var d=$('#AfterFreightRate'+userid).val();
//console.log(a);
// console.log(b);
// console.log(c);
// console.log(d);
populateValueMainFormForEditImportTax();
$('#editimportpomodel').modal('hide');
setTimeout(() => {
alert("Line Item Update SuccesFully..");
}, 1000);
}
});
function populateValueMainFormForEditImportTax() {
var rows = document.getElementById('ImportTax').rows.length;
var TotalLanding = 0;
@ -3992,7 +3875,6 @@ $('#ImportAppend').append(rowHtml);
var rowid = cells[0].innerHTML;
var AfterLandingCharge = $('#AfterLandingChargee' + rowid).val() == '' ? '0.00' : $('#AfterLandingChargee' + rowid).val();
//console.log(AfterLandingCharge);
var AfterCustomduty = $('#AfterCustomduty' + rowid).val() == '' ? '0.00' : $('#AfterCustomduty' + rowid).val();
var AfterCustomEDcess = $('#AfterCustomEDcess' + rowid).val() == '' ? '0.00' : $('#AfterCustomEDcess' + rowid).val();
var AfterCustomSHcess = $('#AfterCustomSHcess' + rowid).val() == '' ? '0.00' : $('#AfterCustomSHcess' + rowid).val();

27
app/Views/includes/new_header.php
View File

@ -120,6 +120,7 @@
margin-top: 55px;
}
}
@media (max-width: 992px) {
.synczohobooks_button {
margin-top: 55px;
@ -331,6 +332,26 @@
z-index: 1;
color: rgb(173, 3, 23);
}
/* This CSS is for Table Cell Expend*/
.text-truncate {
max-width: 120px;
/* Adjust width as needed */
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.text-truncate:hover {
white-space: normal;
overflow: visible;
word-wrap: break-word;
max-width: none;
}
.text-truncate.expanded {
white-space: normal;
max-width: none;
}
/* This CSS is for Table Cell Expend*/
</style>
</head>
@ -346,11 +367,11 @@
<ul class="list-unstyled topnav-menu float-right mb-0">
<li class="dropdown d-none d-lg-inline-block">
<!-- <li class="dropdown d-none d-lg-inline-block">
<a class="nav-link dropdown-toggle arrow-none waves-effect waves-light" data-toggle="fullscreen" href="#">
<i class="fe-maximize noti-icon"></i>
</a>
</li>
</li> -->
<li class="dropdown notification-list topbar-dropdown">
<a class="nav-link dropdown-toggle nav-user mr-0 waves-effect waves-light" data-toggle="dropdown" href="#" role="button" aria-haspopup="false" aria-expanded="false">
@ -403,7 +424,7 @@
</span>
</a>
<a href="index.html" class="logo logo-light text-center">
<a href="<?php echo base_url(); ?>sales_dashboard" class="logo logo-light text-center">
<span class="logo-sm">
<img src="<?php echo base_url(); ?>public/new_assets/images/RI.png" alt="" height="30">
</span>

2
app/Views/requisitionform.php
View File

@ -39,7 +39,7 @@ if (!empty($Emp)) {
<div class="col-12">
<div class="page-title-box page-title-box-alt">
<h4><?= "Add Requisition"; ?></h4>
<a href="<?php echo base_url(); ?>Requisition"><button type="button" class="btn btn-dark waves-effect waves-light">Back</button></a>
<a href="<?php echo base_url(); ?>Requisition"><button type="button" class="btn btn-secondary">Back</button></a>
</div>
</div>
</div>

161
app/Views/servicePurchaseorder.php
View File

@ -559,6 +559,89 @@ if (!empty($INRSYMBOL)) {
$('#Schedulediv').show();
});
clearTotalItemValues();
$('#Edit').click(function() {
console.log("1111111111111111111");
// tinyMCE.triggerSave();
console.log("2222222222222222");
if (validateEditServiceTax()) {
alert('inside Add');
var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val();
var editMaterialCode = $("#EditMaterialCode").val();
var editDescription = $("#EditItemName").val();
var editUOM = $('#EditUOM').val();
var editPer = '';
if ($("#EditPer").val().trim() == '') {
editPer = $("#EditUOM").val();
} else {
editPer = $("#EditPer").val();
}
var editQuantity = $('#EditQuantity').val();
var itemRate = $("#EditRate").val();
var Cgst = $("#EditCgst").val();
var AfterCgst = $("#EditAfterCgst").val();
var Sgst = $("#EditSgst").val();
var AfterSgst = $("#EditAfterSgst").val();
var Igst = $("#EditIgst").val();
var AfterIgst = $("#EditAfterIgst").val();
var Frequency = $("#EditFrequency").val();
var FrequencyValue = $("#EditFrequencyNo").val();
var ServiceDescription = $('#EdittxtSpcialInstruction').val();
var OtherAmt = $('#EditOtherAllowances').val();
var TotalOrderValue = $("#EditTotalOrderValue ").val();
var basicval = $("#txtEditBasicValue").val();
var TotalTaxValue = calculateEditTaxValue();
var tr = document.getElementById(userid);
var cellval = tr.cells;
cellval[2].innerHTML = editMaterialCode;
cellval[3].innerHTML = editDescription;
cellval[4].innerHTML = editQuantity;
cellval[5].innerHTML = editUOM;
cellval[6].innerHTML = parseFloat(itemRate).toFixed(2);
cellval[7].innerHTML = parseFloat(basicval).toFixed(2);
cellval[8].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
cellval[9].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
$('#materialCode' + userid).val(editMaterialCode);
$('#materialName' + userid).val(editDescription);
$('#uom' + userid).val(editUOM);
$('#per' + userid).val(editPer);
$('#quantity' + userid).val(editQuantity);
$('#itemRate' + userid).val(itemRate);
$('#Cgst' + userid).val(Cgst);
$('#AfterCgst' + userid).val(AfterCgst);
$('#Sgst' + userid).val(Sgst);
$('#AfterSgst' + userid).val(AfterSgst);
$('#Igst' + userid).val(Igst);
$('#AfterIgst' + userid).val(AfterIgst);
$('#ItemDescription' + userid).val(ServiceDescription);
$('#OtherAmt' + userid).val(OtherAmt);
$('#TotalOrderValue' + userid).val(TotalOrderValue);
populateValueMainFormForEditServiceTax();
}
});
});
</script>
<style>
@ -1819,84 +1902,6 @@ if (!empty($INRSYMBOL)) {
});
$('.EditService').click(function() {
tinyMCE.triggerSave();
if (validateEditServiceTax()) {
//alert('inside Add');
var CostCode = $("#EditCostCenter").val();
var AvilBudget = $('#EditAvlBudAmt').val();
var editMaterialCode = $("#EditMaterialCode").val();
var editDescription = $("#EditItemName").val();
var editUOM = $('#EditUOM').val();
var editPer = '';
if ($("#EditPer").val().trim() == '') {
editPer = $("#EditUOM").val();
} else {
editPer = $("#EditPer").val();
}
var editQuantity = $('#EditQuantity').val();
var itemRate = $("#EditRate").val();
var Cgst = $("#EditCgst").val();
var AfterCgst = $("#EditAfterCgst").val();
var Sgst = $("#EditSgst").val();
var AfterSgst = $("#EditAfterSgst").val();
var Igst = $("#EditIgst").val();
var AfterIgst = $("#EditAfterIgst").val();
var Frequency = $("#EditFrequency").val();
var FrequencyValue = $("#EditFrequencyNo").val();
var ServiceDescription = $('#EdittxtSpcialInstruction').val();
var OtherAmt = $('#EditOtherAllowances').val();
var TotalOrderValue = $("#EditTotalOrderValue ").val();
var basicval = $("#txtEditBasicValue").val();
var TotalTaxValue = calculateEditTaxValue();
var tr = document.getElementById(userid);
var cellval = tr.cells;
cellval[2].innerHTML = editMaterialCode;
cellval[3].innerHTML = editDescription;
cellval[4].innerHTML = editQuantity;
cellval[5].innerHTML = editUOM;
cellval[6].innerHTML = parseFloat(itemRate).toFixed(2);
cellval[7].innerHTML = parseFloat(basicval).toFixed(2);
cellval[8].innerHTML = parseFloat(TotalTaxValue).toFixed(2);
cellval[9].innerHTML = parseFloat(TotalOrderValue).toFixed(2);
$('#materialCode' + userid).val(editMaterialCode);
$('#materialName' + userid).val(editDescription);
$('#uom' + userid).val(editUOM);
$('#per' + userid).val(editPer);
$('#quantity' + userid).val(editQuantity);
$('#itemRate' + userid).val(itemRate);
$('#Cgst' + userid).val(Cgst);
$('#AfterCgst' + userid).val(AfterCgst);
$('#Sgst' + userid).val(Sgst);
$('#AfterSgst' + userid).val(AfterSgst);
$('#Igst' + userid).val(Igst);
$('#AfterIgst' + userid).val(AfterIgst);
$('#ItemDescription' + userid).val(ServiceDescription);
$('#OtherAmt' + userid).val(OtherAmt);
$('#TotalOrderValue' + userid).val(TotalOrderValue);
populateValueMainFormForEditServiceTax();
}
});
function addHidden(theForm, key, value) {
// Create a hidden input element, and append it to the form:

3
system/Helpers/form_helper.php
View File

@ -250,6 +250,9 @@ if (! function_exists('form_multiselect')) {
if (stripos($extra, 'multiple') === false) {
$extra .= ' multiple="multiple"';
}
if (stripos($extra, 'class=') === false) {
$extra .= ' class="form-control"'; // Add your desired default class here
}
return form_dropdown($name, $options, $selected, $extra);
}