Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme
This commit is contained in:
vadivelJ96
commit
ee0c93d73e
@ -400,15 +400,16 @@ 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_new($DeliveryChellan);
|
||||
$DeliveryChellanDate = get_date_time_dynamical_format('d-m-Y',$DeliveryChellan);
|
||||
$Mat_Rcvd_Dt = (string)$this->request->getPost('MaterialRcvdDate');
|
||||
$MaterialRcvdDt = get_date_time_format_new($Mat_Rcvd_Dt);
|
||||
$MaterialRcvdDt = get_date_time_dynamical_format('d-m-Y',$Mat_Rcvd_Dt);
|
||||
$VehicleNo = $this->request->getPost('VehicleNo');
|
||||
$TransporterId = $this->request->getPost('TransporterId');
|
||||
$DriverName = $this->request->getPost('DriverName');
|
||||
$DriverMobileNumber = $this->request->getPost('DriverMobileNumber');
|
||||
$CreatedBy = $this->session->get('userId');
|
||||
$RowCount = $this->request->getPost('txtRowCount');
|
||||
$MasterRemarks = $this->request->getPost('MasterRemarks');
|
||||
$createddt = get_current_date_time();
|
||||
//$IGRStatus = IGR_CREATED;//old
|
||||
$PreIGRStatus = (int)$this->request->getPost('hideIGRStatus') == 1 ? IGR_CREATED : IGR_DRAFT;
|
||||
@ -441,13 +442,11 @@ class Inwardgateregister extends BaseController
|
||||
}
|
||||
}
|
||||
#Step 3 Master Details Gathering to Save In DB
|
||||
$igr = array('PONO' => $PONO, 'VehicleNo' => $VehicleNo, 'TransporterId'=>$TransporterId,'DeliveryChellanOrInvoiceNo' => $DeliveryChellanOrInvoiceNo, 'DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt, 'DriverName' => $DriverName, 'DriverMobileNumber' => $DriverMobileNumber,'IGRStatus' => $IGRStatus, 'CreatedBy' => $CreatedBy, 'CreatedDate' => $createddt, 'PaymentStatus' => $paymentstatus);
|
||||
$igr = array('PONO' => $PONO, 'VehicleNo' => $VehicleNo, 'TransporterId'=>$TransporterId,'DeliveryChellanOrInvoiceNo' => $DeliveryChellanOrInvoiceNo, 'DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt, 'DriverName' => $DriverName, 'DriverMobileNumber' => $DriverMobileNumber,'IGRStatus' => $IGRStatus, 'CreatedBy' => $CreatedBy, 'CreatedDate' => $createddt, 'PaymentStatus' => $paymentstatus, 'Remarks'=>$MasterRemarks);
|
||||
$igr['MasterFile'] = $requestMasterFileName;
|
||||
#Step 4 Calling DB to Save IGR Master
|
||||
$IGRNO = $this->inwardgateregister_model->addigrM($igr);
|
||||
// echo "master - no problem";
|
||||
// $IGRNO = "IGRNO02767";
|
||||
// print_r($this->request->getPost());die;
|
||||
|
||||
if($IGRNO){
|
||||
$files = $this->request->getFiles();
|
||||
$fileNames = $this->request->getPost('file_name'); // Get user-entered file names
|
||||
@ -720,10 +719,42 @@ function viewIGRDetails()
|
||||
$IGRNO = $this->request->getPost('id');
|
||||
|
||||
$data['details'] = $this->inwardgateregister_model->viewigr($IGRNO);
|
||||
$data['files'] = $this->inwardgateregister_model->viewIGRFile($IGRNO);
|
||||
$TaxInPercentage = 0;
|
||||
for ($i = 0; $i < count($data['details']); $i++) {
|
||||
$details = $data['details'][$i];
|
||||
|
||||
// echo $IGRNO;
|
||||
// print_r($data);die;
|
||||
if ($details->POType == 'IMPORT') {
|
||||
$TaxInPercentage = isset($details->import_igst) ? $details->import_igst : 0;
|
||||
}
|
||||
|
||||
if ($details->POType == 'CAPITAL' && $details->CapitalRange == 0) {
|
||||
$TaxInPercentage = isset($details->import_igst) ? $details->import_igst : 0;
|
||||
}
|
||||
|
||||
if ($details->POType == 'CAPITAL' && $details->CapitalRange == 1) {
|
||||
$TaxInPercentage =
|
||||
(isset($details->service_cgst) ? $details->service_cgst : 0) +
|
||||
(isset($details->service_sgst) ? $details->service_sgst : 0) +
|
||||
(isset($details->service_igst) ? $details->service_igst : 0);
|
||||
}
|
||||
|
||||
if ($details->POType == 'REVENUE') {
|
||||
$TaxInPercentage =
|
||||
(isset($details->revenue_cgst) ? $details->revenue_cgst : 0) +
|
||||
(isset($details->revenue_sgst) ? $details->revenue_sgst : 0) +
|
||||
(isset($details->revenue_igst) ? $details->revenue_igst : 0);
|
||||
}
|
||||
|
||||
if ($details->POType == 'SERVICE') {
|
||||
$TaxInPercentage =
|
||||
(isset($details->service_cgst) ? $details->service_cgst : 0) +
|
||||
(isset($details->service_sgst) ? $details->service_sgst : 0) +
|
||||
(isset($details->service_igst) ? $details->service_igst : 0);
|
||||
}
|
||||
|
||||
$data['details'][$i]->TaxInPercentage = $TaxInPercentage;
|
||||
}
|
||||
$data['files'] = $this->inwardgateregister_model->viewIGRFile($IGRNO);
|
||||
|
||||
echo json_encode($data);
|
||||
}
|
||||
@ -768,7 +799,7 @@ function viewIGRDetails()
|
||||
$TransporterId = $this->request->getPost('Transporter_Id');
|
||||
$DriverName = $this->request->getPost('driver');
|
||||
$DriverMobileNumber = $this->request->getPost('driver_mobile');
|
||||
|
||||
|
||||
$IGRStatus = (int)$this->request->getPost('status') == 1 ? IGR_CREATED : IGR_DRAFT;
|
||||
|
||||
$tableData = $this->request->getPost('tableData');
|
||||
@ -780,7 +811,8 @@ function viewIGRDetails()
|
||||
$path = ROOTPATH.'public/uploads/Igrfiles/';
|
||||
if(!is_dir($path)) { mkdir($path, 0777, true); }
|
||||
|
||||
$igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'TransporterId'=>$TransporterId,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'IGRStatus' => $IGRStatus,'UpdateBY' => $updateby,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanOrInvoiceNo);
|
||||
$MasterRemarks = $this->request->getPost('MasterRemarks');
|
||||
$igrarr = array('DeliveryChellanDate' => $DeliveryChellanDate, 'MaterialRcvdDate' => $MaterialRcvdDt,'VehicleNo'=>$VehicleNo,'TransporterId'=>$TransporterId,'DriverMobileNumber'=>$DriverMobileNumber,'DriverName'=>$DriverName, 'IGRStatus' => $IGRStatus,'UpdateBY' => $updateby,'DeliveryChellanOrInvoiceNo'=>$DeliveryChellanOrInvoiceNo,'Remarks'=>$MasterRemarks);
|
||||
|
||||
$MasterFile = $this->request->getfile('MasterFile');
|
||||
|
||||
@ -830,6 +862,8 @@ function viewIGRDetails()
|
||||
}
|
||||
|
||||
log_message('error', 'UpdateIGR igrarr: ' . json_encode($igrarr));
|
||||
$getigrstatus = $this->inwardgateregister_model->getigrstatus($IGRNo);
|
||||
$getigrstatus = $getigrstatus->IGRStatus;
|
||||
$updateigrmaster = $this->inwardgateregister_model->updateigr($igrarr, $IGRNo);
|
||||
log_message('error', "Master updated successfully: " . $updateigrmaster);
|
||||
if(!empty($tableData )){
|
||||
@ -1083,7 +1117,8 @@ function viewIGRDetails()
|
||||
|
||||
|
||||
if ($updateigrmaster > 0 || $updateigrlineitem > 0) {
|
||||
if ($IGRStatus == IGR_CREATED || $IGRStatus == MRIR_CREATED || $IGRStatus == MRIR_APPROVED ) {
|
||||
|
||||
if ($getigrstatus == 'ST027') {
|
||||
|
||||
$result_for_email = $this->inwardgateregister_model->getDetailsforEmail($this->session->get('userId'));
|
||||
$notification = new Notification();
|
||||
@ -1091,7 +1126,7 @@ function viewIGRDetails()
|
||||
for ($i = 0; $i < count($result_for_email['emails']); $i++) {
|
||||
$email_response = $notification->sendEmail([
|
||||
'recipient_email' => $result_for_email['emails'][$i]->email,
|
||||
'subject' => 'Resico Industries - IGR Notification',
|
||||
'subject' => $result_for_email['company'].' - IGR Notification',
|
||||
'description' => 'IGR Number : '.$IGRNo.' is Edited By '.($result_for_email['full_name'] ?? $this->session->get('name')),
|
||||
'company' => $result_for_email['company'],
|
||||
'from_mail'=> $result_for_email['from_mail']
|
||||
|
||||
@ -612,7 +612,13 @@ class Payslip extends BaseController
|
||||
$Sunday = $value->sunday_count; // Sunday count
|
||||
$LOP_Days = $value->NoofDays - ($Days_worked + $Sunday); // not working day
|
||||
$Paid_leave = $value->Paid_leave; // leave day
|
||||
$OT_Hrs_Worked = $value->OT_Hrs_Worked; //OT hours
|
||||
if ($value->is_management_team == 1)
|
||||
{
|
||||
$OT_Hrs_Worked = 0; //OT hours
|
||||
$value->OT_Hrs_Worked = 0;
|
||||
} else {
|
||||
$OT_Hrs_Worked = $value->OT_Hrs_Worked; //OT hours
|
||||
}
|
||||
$Monthly_Due = $value->Monthly_Due; // AUTO LOAN DUE
|
||||
$Loan_Recovered = $value->Loan_Recovered; //MANUAL LOAN DUE
|
||||
$due_start_date = $value->DueDate;
|
||||
@ -743,7 +749,13 @@ class Payslip extends BaseController
|
||||
$Sunday = $value->sunday_count; // Sunday count
|
||||
$LOP_Days = $value->NoofDays - ($Days_worked + $Sunday); // not working day
|
||||
$Paid_leave = $value->Paid_leave; // leave day
|
||||
$OT_Hrs_Worked = $value->OT_Hrs_Worked; //OT hours
|
||||
if ($value->is_management_team == 1)
|
||||
{
|
||||
$OT_Hrs_Worked = 0; //OT hours
|
||||
$value->OT_Hrs_Worked = 0;
|
||||
} else {
|
||||
$OT_Hrs_Worked = $value->OT_Hrs_Worked; //OT hours
|
||||
}
|
||||
$Monthly_Due = $value->Monthly_Due; // AUTO LOAN DUE
|
||||
$Loan_Recovered = $value->Loan_Recovered; //MANUAL LOAN DUE
|
||||
$due_start_date = $value->DueDate;
|
||||
|
||||
@ -87,19 +87,28 @@ class Supplier extends BaseController
|
||||
'Address' => [
|
||||
'label' => 'Address',
|
||||
'rules' => 'trim|required'
|
||||
],
|
||||
'ContactNumber' => [
|
||||
'label' => 'Contact Number',
|
||||
'rules' => 'trim|required|max_length[13]'
|
||||
],
|
||||
'AlternateContactNumber' => [
|
||||
'label' => 'Alternate Contact Number',
|
||||
'rules' => 'trim|max_length[13]'
|
||||
],
|
||||
'emailid' => [
|
||||
'label' => 'Email',
|
||||
'rules' => 'valid_email|max_length[128]|required'
|
||||
],'accno' => [
|
||||
'label' => 'accno',
|
||||
'rules' => 'trim|required'
|
||||
],'ifsc' => [
|
||||
'label' => 'ifsc',
|
||||
'rules' => 'trim|required'
|
||||
],'Payment' => [
|
||||
'label' => 'Payment',
|
||||
'rules' => 'trim|required'
|
||||
]
|
||||
// 'ContactNumber' => [
|
||||
// 'label' => 'Contact Number',
|
||||
// 'rules' => 'trim|required|max_length[13]'
|
||||
// ],
|
||||
// 'AlternateContactNumber' => [
|
||||
// 'label' => 'Alternate Contact Number',
|
||||
// 'rules' => 'trim|max_length[13]'
|
||||
// ],
|
||||
// 'emailid' => [
|
||||
// 'label' => 'Email',
|
||||
// 'rules' => 'valid_email|max_length[128]|required'
|
||||
// ]
|
||||
];
|
||||
|
||||
$messages = [
|
||||
@ -109,18 +118,27 @@ class Supplier extends BaseController
|
||||
'Address' => [
|
||||
'required' => 'Please enter an address.'
|
||||
],
|
||||
'ContactNumber' => [
|
||||
'required' => 'Please enter a contact number.',
|
||||
'max_length' => 'The contact number cannot exceed {param} characters.'
|
||||
'accno' => [
|
||||
'required' => 'Please enter an Account Number.'
|
||||
],
|
||||
'AlternateContactNumber' => [
|
||||
'max_length' => 'The alternate contact number cannot exceed {param} characters.'
|
||||
'ifsc' => [
|
||||
'required' => 'Please enter a Bank IFSC Code.'
|
||||
],
|
||||
'emailid' => [
|
||||
'required' => 'Please enter an email address.',
|
||||
'valid_email' => 'Please enter a valid email address.',
|
||||
'max_length' => 'The email address cannot exceed {param} characters.'
|
||||
]
|
||||
'Payment' => [
|
||||
'required' => 'Please Select the Payment option.'
|
||||
],
|
||||
// 'ContactNumber' => [
|
||||
// 'required' => 'Please enter a contact number.',
|
||||
// 'max_length' => 'The contact number cannot exceed {param} characters.'
|
||||
// ],
|
||||
// 'AlternateContactNumber' => [
|
||||
// 'max_length' => 'The alternate contact number cannot exceed {param} characters.'
|
||||
// ],
|
||||
// 'emailid' => [
|
||||
// 'required' => 'Please enter an email address.',
|
||||
// 'valid_email' => 'Please enter a valid email address.',
|
||||
// 'max_length' => 'The email address cannot exceed {param} characters.'
|
||||
// ]
|
||||
// 'panno' => [
|
||||
// 'required' => 'Please enter an panno address.',
|
||||
// 'max_length' => 'The panno cannot exceed {param} characters.'
|
||||
@ -253,6 +271,7 @@ class Supplier extends BaseController
|
||||
$file1 = $this->request->getFile('Cert_MSME');
|
||||
$file2 = $this->request->getFile('Cert_GST');
|
||||
$file3 = $this->request->getFile('Cert_BANK');
|
||||
$file4 = $this->request->getFile('Cert_PAN');
|
||||
$path = ROOTPATH.'public/uploads/images/';
|
||||
|
||||
if($PAN){ $supplier['PAN'] = $PAN;}
|
||||
@ -287,6 +306,16 @@ class Supplier extends BaseController
|
||||
$supplier['Cert_BANK'] = $this->request->getPost('hidden_Cert_BANK') ? $this->request->getPost('hidden_Cert_BANK') : NULL;
|
||||
}
|
||||
|
||||
if ($file4 && $file4->isValid() && !$file4->hasMoved()) {
|
||||
if(!is_dir($path)) { mkdir($path, 0777, true); }
|
||||
$PAN_DOC = $file4->getName();
|
||||
$file4->move($path,$PAN_DOC);
|
||||
$supplier['Cert_PAN'] = $PAN_DOC;
|
||||
}
|
||||
else{
|
||||
$supplier['Cert_PAN'] = $this->request->getPost('hidden_Cert_PAN') ? $this->request->getPost('hidden_Cert_PAN') : NULL;
|
||||
}
|
||||
|
||||
$result = $this->supplier_model->UpdateSupplier($supplier, $SupplierID);
|
||||
|
||||
if ($result == True) {
|
||||
|
||||
@ -40,9 +40,10 @@ class Notification
|
||||
if (!empty($ccRecipients)) {
|
||||
$this->email->setCC($ccRecipients);
|
||||
}
|
||||
} else {
|
||||
$this->email->setCC('vadivel.j@venbainfotech.com');
|
||||
}
|
||||
}
|
||||
// else {
|
||||
// $this->email->setCC('vadivel.j@venbainfotech.com');
|
||||
// }
|
||||
|
||||
if ($bcc !== '') {
|
||||
$bccRecipients = explode(',', trim($bcc));
|
||||
@ -50,9 +51,10 @@ class Notification
|
||||
if(!empty($bccRecipients)) {
|
||||
$this->email->setBCC($bccRecipients);
|
||||
}
|
||||
}else{
|
||||
$this->email->setCC('gowtham.m@venbainfotech.com');
|
||||
}
|
||||
// else{
|
||||
// $this->email->setCC('gowtham.m@venbainfotech.com');
|
||||
// }
|
||||
|
||||
if ($this->email->send()) {
|
||||
$message['success'] = 'Email sent successfully';
|
||||
|
||||
@ -32,10 +32,10 @@ if (!function_exists('get_date_time_format')) {
|
||||
}
|
||||
}
|
||||
|
||||
if (!function_exists('get_date_time_format_new')) {
|
||||
function get_date_time_format_new($val)
|
||||
if (!function_exists('get_date_time_dynamical_format')) {
|
||||
function get_date_time_dynamical_format($format,$val)
|
||||
{
|
||||
$date = \DateTime::createFromFormat('d/m/Y', $val, new \DateTimeZone('Asia/Kolkata'));
|
||||
$date = \DateTime::createFromFormat($format, $val, new \DateTimeZone('Asia/Kolkata'));
|
||||
return $date->format('Y-m-d H:i:s');
|
||||
}
|
||||
}
|
||||
|
||||
@ -379,23 +379,31 @@ class Inwardgateregister_model extends Model
|
||||
|
||||
// Build subQuery2 dynamically for rate and tax based on POType
|
||||
$subQuery2 = "(CASE
|
||||
WHEN PO.POType = 'revenue' THEN (
|
||||
SELECT JSON_OBJECT('total_rate', SUM(POL.Rate), 'total_tax', AVG(tax.CGST + tax.SGST + tax.IGST))
|
||||
FROM t_igr_details IGRD
|
||||
LEFT JOIN t_purchaseorder_lineitem POL ON PONO = POL.PONO AND IGRD.MaterialCode = POL.MaterialCode
|
||||
LEFT JOIN t_revenue_tax tax ON tax.LineItemNo = POL.LineItemNo
|
||||
WHERE IGRD.IGRNO = igr.IGRNO
|
||||
)
|
||||
WHEN PO.POType = 'service' THEN (
|
||||
SELECT JSON_OBJECT('total_rate', SUM(POL.Rate), 'total_tax', AVG(tax.CGST + tax.SGST + tax.IGST))
|
||||
FROM t_igr_details IGRD
|
||||
LEFT JOIN t_purchaseorder_lineitem POL ON PONO = POL.PONO AND IGRD.MaterialCode = POL.MaterialCode
|
||||
LEFT JOIN t_service_tax tax ON tax.LineItemNo = POL.LineItemNo
|
||||
WHERE IGRD.IGRNO = igr.IGRNO
|
||||
)
|
||||
|
||||
ELSE NULL
|
||||
END)";
|
||||
WHEN PO.POType = 'revenue' THEN (
|
||||
SELECT JSON_OBJECT(
|
||||
'total_rate', SUM(POL.Rate * IGRD.QuantityAsPerInvoice),
|
||||
'total_tax', SUM((POL.Rate * IGRD.QuantityAsPerInvoice) * (tax.CGST + tax.SGST + tax.IGST) / 100)
|
||||
)
|
||||
FROM t_igr_details IGRD
|
||||
LEFT JOIN t_purchaseorder_lineitem POL ON PONO = POL.PONO AND IGRD.MaterialCode = POL.MaterialCode
|
||||
LEFT JOIN t_revenue_tax tax ON tax.LineItemNo = POL.LineItemNo
|
||||
WHERE IGRD.IGRNO = igr.IGRNO AND IGRD.QuantityAsPerInvoice != 0
|
||||
LIMIT 1
|
||||
)
|
||||
WHEN (PO.POType = 'service' OR (PO.POType = 'capital' AND PO.CapitalRange = '1')) THEN (
|
||||
SELECT JSON_OBJECT(
|
||||
'total_rate', SUM(POL.Rate * IGRD.QuantityAsPerInvoice),
|
||||
'total_tax', SUM((POL.Rate * IGRD.QuantityAsPerInvoice) * (tax.CGST + tax.SGST + tax.IGST) / 100)
|
||||
)
|
||||
FROM t_igr_details IGRD
|
||||
LEFT JOIN t_purchaseorder_lineitem POL ON PONO = POL.PONO AND IGRD.MaterialCode = POL.MaterialCode
|
||||
LEFT JOIN t_service_tax tax ON tax.LineItemNo = POL.LineItemNo
|
||||
WHERE IGRD.IGRNO = igr.IGRNO AND IGRD.QuantityAsPerInvoice != 0
|
||||
LIMIT 1
|
||||
)
|
||||
|
||||
ELSE NULL
|
||||
END)";
|
||||
|
||||
|
||||
// Main query
|
||||
@ -406,8 +414,8 @@ class Inwardgateregister_model extends Model
|
||||
SUM(IGRD.NetWeight) as NetWeight,
|
||||
COUNT(IGRD.IGRNo) as itemCount,
|
||||
COALESCE(($subQuery1), 0) as remark_count,
|
||||
JSON_EXTRACT(($subQuery2), '$.total_rate') as total_rate,
|
||||
JSON_EXTRACT(($subQuery2), '$.total_tax') as total_tax")
|
||||
JSON_EXTRACT(($subQuery2), '$.total_rate') as taxable_value,
|
||||
JSON_EXTRACT(($subQuery2), '$.total_tax') as gst_amount")
|
||||
->join('t_purchaseorder_master PO', 'igr.PONO = PO.PONO')
|
||||
->join('t_supplierdetailsn sup', 'PO.SupplierID = sup.SupplierID')
|
||||
->join('t_transporter trans', 'igr.TransporterId = trans.id', 'left')
|
||||
@ -512,21 +520,7 @@ class Inwardgateregister_model extends Model
|
||||
$builder = $this->db->table('t_igr_master igr')
|
||||
->distinct()
|
||||
->select("igr.IGRNO,igr.*,igrd.*,MM.MaterialName,MM.UOM,sup.Address,sup.SupplierName,POM.ServiceDescription,POL.Quantity,POL.Rate,POM.POType,POM.IsOpenOrder,
|
||||
SUM(
|
||||
CASE
|
||||
WHEN POM.POType = 'IMPORT'
|
||||
THEN COALESCE(it.IGST, 0)
|
||||
WHEN POM.POType = 'CAPITAL' AND POM.CapitalRange = 0
|
||||
THEN COALESCE(it.IGST, 0)
|
||||
WHEN POM.POType = 'CAPITAL' AND POM.CapitalRange = 1
|
||||
THEN COALESCE(st.CGST, 0) + COALESCE(st.SGST, 0) + COALESCE(st.IGST, 0)
|
||||
WHEN POM.POType = 'REVENUE'
|
||||
THEN COALESCE(rt.CGST, 0) + COALESCE(rt.SGST, 0) + COALESCE(rt.IGST, 0)
|
||||
WHEN POM.POType = 'SERVICE'
|
||||
THEN COALESCE(st.CGST, 0) + COALESCE(st.SGST, 0) + COALESCE(st.IGST, 0)
|
||||
ELSE 0
|
||||
END
|
||||
) AS TaxInPercentage", false)
|
||||
POM.CapitalRange,POM.CapitalRange,st.CGST as service_cgst,st.SGST as service_sgst,st.IGST as service_igst,it.IGST as import_igst,rt.CGST as revenue_cgst,rt.SGST as revenue_sgst,rt.IGST as revenue_igst")
|
||||
->join('t_igr_details igrd', 'igrd.IGRNO = igr.IGRNO')
|
||||
->join('t_purchaseorder_master POM', 'igr.PONO = POM.PONO')
|
||||
->join('t_purchaseorder_lineitem POL', 'igr.PONO = POL.PONO and POL.MaterialCode=igrd.MaterialCode ')
|
||||
@ -1226,5 +1220,15 @@ class Inwardgateregister_model extends Model
|
||||
return $result;
|
||||
}
|
||||
|
||||
public function getigrstatus($IGRNo){
|
||||
|
||||
$builder = $this->db->table('t_igr_master')
|
||||
->select('IGRStatus')
|
||||
->where('IGRNO',$IGRNo)
|
||||
->get();
|
||||
$result = $builder->getRow();
|
||||
return $result;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -218,8 +218,7 @@ class Monthlypay_model extends Model
|
||||
return $i;
|
||||
} elseif ($count == 1) {
|
||||
$this->db->table('t_monthly_pay_inputs')
|
||||
// ->where('H_date', $data['H_Date']) // ask velmurugan H_Date public hoilday table la irukku
|
||||
->where('EmpID', $data['EmpID']) // temp solution
|
||||
->where('EmpID', $data['EmpID'])
|
||||
->where('Month_Year', $data['Month_Year'])
|
||||
->update($data);
|
||||
|
||||
|
||||
@ -64,16 +64,16 @@
|
||||
<input type="text" name="SupplierName" maxlength="100" id="supplierName" class="form-control" required>
|
||||
</div>
|
||||
<div class=" col-md-3">
|
||||
<label class="col-form-label" for="ContactNumber">Contact Number<span class="badge">*</span></label>
|
||||
<input type="text" name="ContactNumber" onchange="return getContactNumberValidation();" id="ContactNumber" required maxlength="13" class="form-control" title="Please Enter Mobile Number (or) Telephone Number" onkeypress="return isNumberKey(event)">
|
||||
<label class="col-form-label" for="ContactNumber">Contact Number</label>
|
||||
<input type="text" name="ContactNumber" onchange="return getContactNumberValidation();" id="ContactNumber" maxlength="13" class="form-control" title="Please Enter Mobile Number (or) Telephone Number" onkeypress="return isNumberKey(event)">
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label class="col-form-label" for="AlternateContactNumber">Alternate Contact Number</label>
|
||||
<input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();" id="AlternateContactNumber" maxlength="13" class="form-control" title="Please Enter Mobile Number (or) Telephone Number" onkeypress="return isNumberKey(event)">
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label class="col-form-label" for="EmailAddress">Email ID<span class="badge">*</span></label>
|
||||
<input type="email" name="emailid" id="emailid" required maxlength="100" class="form-control">
|
||||
<label class="col-form-label" for="EmailAddress">Email ID</label>
|
||||
<input type="email" name="emailid" id="emailid" maxlength="100" class="form-control" onchange="validateEmail();">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
@ -161,8 +161,8 @@
|
||||
</div>
|
||||
<div class="form-row" style="margin-top:20px">
|
||||
<div class=" col-md-4">
|
||||
<label class="col-form-label" for="Bank_Address">Bank Address<span class="badge">*</span></label>
|
||||
<input type="text" id="bankaddress" name="bankaddress" maxlength="200" class="form-control" required>
|
||||
<label class="col-form-label" for="Bank_Address">Bank Address</label>
|
||||
<input type="text" id="bankaddress" name="bankaddress" maxlength="200" class="form-control" >
|
||||
</div>
|
||||
<div class=" col-md-4">
|
||||
<label class="col-form-label" for="Cert_BANK">Select Bank Document<small> (only .pdf, .doc, .png, .jpg)</small></label>
|
||||
@ -174,34 +174,37 @@
|
||||
|
||||
|
||||
<div class="col-md-12" style="margin-bottom: 27px;">
|
||||
<div class="form-row">
|
||||
<div class="col-md-3">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
<legend style="margin-left:-10px;color: #4f7c97;">Payment Details</legend>
|
||||
<!-- Text input-->
|
||||
|
||||
|
||||
<div class="col-md-12" style="margin-bottom: 27px;">
|
||||
<div class="col-md-3">
|
||||
<label for="payablefrom">Payable Terms <span class="text-danger">*</span></label>
|
||||
<select class="form-control required select2" id="Payment" name="Payment"
|
||||
onchange="payment_hidden();" required >
|
||||
<option value="">Select Payment method</option>
|
||||
<?php
|
||||
if (!empty($payment)) {
|
||||
foreach ($payment as $pmt) {
|
||||
?>
|
||||
<option value="<?php echo $pmt->PaymentID ?>"><?php echo $pmt->PaymentTerms ?></option>
|
||||
<?php
|
||||
}
|
||||
}
|
||||
?>
|
||||
</select>
|
||||
<input type="hidden" id="paymentid" name="paymentid" value="">
|
||||
<!--<input type="hidden" id="paymentname" name="paymentname" value=""> -->
|
||||
<div class="form-row">
|
||||
<div class=" col-md-4">
|
||||
<label for="payablefrom">Payable Terms <span class="text-danger">*</span></label>
|
||||
<select class="form-control required select2" id="Payment" name="Payment"
|
||||
onchange="payment_hidden();" required >
|
||||
<option value="">Select Payment method</option>
|
||||
<?php
|
||||
if (!empty($payment)) {
|
||||
foreach ($payment as $pmt) {
|
||||
?>
|
||||
<option value="<?php echo $pmt->PaymentID ?>"><?php echo $pmt->PaymentTerms ?></option>
|
||||
<?php
|
||||
}
|
||||
}
|
||||
?>
|
||||
</select>
|
||||
<input type="hidden" id="paymentid" name="paymentid" value="">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-12 text-right">
|
||||
<input type="reset" id="reset" class="btn btn-reset" style="background-color: red;color: white; margin-right: 15px;width: 80px;" value="Reset" />
|
||||
<input type="button" id="addSupplierBtnId" value="Submit" class="btn btn-success">
|
||||
@ -246,10 +249,7 @@
|
||||
$("#ContactNumber").focus();
|
||||
return false;
|
||||
}
|
||||
if (!validateEmail()) {
|
||||
$('#emailid').focus();
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
if ($("#Address").val().length < 1) {
|
||||
alert('Please Enter Address');
|
||||
@ -257,12 +257,24 @@
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!validateEmail()) {
|
||||
alert('Please Enter Valid Email Address');
|
||||
$('#emailid').focus();
|
||||
if ($("#accno").val().length < 1) {
|
||||
alert('Please Enter Account number');
|
||||
$("#accno").focus();
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($("#ifsc").val().length < 1) {
|
||||
alert('Please Enter Bank IFSC code');
|
||||
$("#ifsc").focus();
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($("#Payment").val().length < 1) {
|
||||
alert('Please select the Payment option');
|
||||
$("#Payment").focus();
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
}
|
||||
@ -311,21 +323,6 @@
|
||||
});
|
||||
});
|
||||
|
||||
//Email Validate
|
||||
function validateEmail() {
|
||||
var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
|
||||
|
||||
var email = $('#EmailAddress').val();
|
||||
if (email != "") {
|
||||
if (reg.test(email) == false) {
|
||||
alert('Please Enter Valid Email Address');
|
||||
return (false);
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function alphaNumberic(e) {
|
||||
var k;
|
||||
document.all ? k = e.keyCode : k = e.which;
|
||||
@ -480,9 +477,10 @@
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
alert('Please Enter email id');
|
||||
}
|
||||
}
|
||||
// else {
|
||||
// alert('Please Enter email id');
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
|
||||
@ -22,6 +22,7 @@ $IsRawMaterial = '';
|
||||
$PaymentId = '';
|
||||
$hidden_Cert_MSME = '';
|
||||
$hidden_Cert_GST = '';
|
||||
$hidden_Cert_PAN = '';
|
||||
$hidden_Cert_BANK = '';
|
||||
|
||||
if (!empty($supplier)) {
|
||||
@ -51,6 +52,7 @@ if (!empty($supplier)) {
|
||||
$PaymentId = $uf->PaymentID;
|
||||
$hidden_Cert_MSME = $uf->Cert_MSME;
|
||||
$hidden_Cert_GST = $uf->Cert_GST;
|
||||
$hidden_Cert_PAN = $uf->Cert_PAN;
|
||||
$hidden_Cert_BANK = $uf->Cert_BANK;
|
||||
}
|
||||
}
|
||||
@ -175,9 +177,10 @@ if (!empty($supplier)) {
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
alert('Please Enter email id');
|
||||
}
|
||||
}
|
||||
// else {
|
||||
// alert('Please Enter email id');
|
||||
// }
|
||||
|
||||
}
|
||||
|
||||
@ -282,7 +285,7 @@ if (!empty($supplier)) {
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="page-title-box page-title-box-alt">
|
||||
<h4 class="page-title">Edit Supplier Details</h4>
|
||||
<h4 class="page-title">Edit Supplier Details <?php echo $SupplierID; ?></h4>
|
||||
<button type="button" class="btn btn-secondary" onclick="history.back()">
|
||||
<span class="bold">Cancel</span>
|
||||
</button>
|
||||
@ -311,59 +314,37 @@ if (!empty($supplier)) {
|
||||
<!-- Supplier Information -->
|
||||
<div class="col-md-12" style="margin-bottom: 27px;">
|
||||
<div class="form-row" style="margin-bottom:10px;">
|
||||
<div class="col-md-2">
|
||||
<label class="col-form-label" for="SupplierID">Supplier ID<span
|
||||
class="badge">*</span></label>
|
||||
<input type="text" name="SupplierID" id="SupplierID" class="form-control" readonly
|
||||
value="<?php echo $SupplierID; ?>">
|
||||
<input type="hidden" name="SupplierID" id="SupplierID" value="<?php echo $SupplierID; ?>">
|
||||
<div class=" col-md-3">
|
||||
<label class="col-form-label" for="SupplierName">Supplier Name<span class="badge">*</span></label>
|
||||
<input type="text" name="SupplierName" maxlength="100" id="supplierName" class="form-control" required value="<?php echo $SupplierName; ?>">
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label class="col-form-label" for="SupplierName">Supplier Name<span
|
||||
class="badge">*</span></label>
|
||||
<input type="text" name="SupplierName" maxlength="100" id="supplierName"
|
||||
class="form-control" required value="<?php echo $SupplierName; ?>">
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label class="col-form-label" for="ContactNumber">Contact Number<span
|
||||
class="badge">*</span></label>
|
||||
<input type="text" name="ContactNumber" onchange="return getContactNumberValidation();"
|
||||
id="ContactNumber" required maxlength="13" class="form-control"
|
||||
value="<?php echo $ContactNumber; ?>"
|
||||
title="Please Enter Mobile Number (or) Telephone Number"
|
||||
onkeypress="return isNumberKey(event)">
|
||||
<label class="col-form-label" for="ContactNumber">Contact Number</label>
|
||||
<input type="text" name="ContactNumber" onchange="return getContactNumberValidation();" id="ContactNumber" maxlength="13" class="form-control" title="Please Enter Mobile Number (or) Telephone Number" value="<?php echo $ContactNumber; ?>" onkeypress="return isNumberKey(event)">
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label class="col-form-label" for="AlternateContactNumber">Alternate Contact Number</label>
|
||||
<input type="text" name="AlternateContactNumber"
|
||||
onchange="return getValidAlternateNumber();" id="AlternateContactNumber" maxlength="13"
|
||||
class="form-control" value="<?php echo $AlternateContactNumber; ?>"
|
||||
title="Please Enter Mobile Number (or) Telephone Number"
|
||||
onkeypress="return isNumberKey(event)">
|
||||
<input type="text" name="AlternateContactNumber" onchange="return getValidAlternateNumber();" id="AlternateContactNumber" maxlength="13" class="form-control" title="Please Enter Mobile Number (or) Telephone Number" onkeypress="return isNumberKey(event)" value="<?php echo $AlternateContactNumber; ?>">
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label class="col-form-label" for="EmailAddress">Email ID<span
|
||||
class="badge">*</span></label>
|
||||
<input type="email" name="emailid" id="emailid" required maxlength="100"
|
||||
class="form-control" value="<?php echo $EmailAddress; ?>"
|
||||
title="Please Enter valid mail address" onchange="validateEmail();">
|
||||
<label class="col-form-label" for="EmailAddress">Email ID</label>
|
||||
<input type="email" name="emailid" id="emailid" maxlength="100" class="form-control" value="<?php echo $EmailAddress; ?>" title="Please Enter valid mail address" onchange="validateEmail();">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
<div class="col-md-12" style="margin-top:5px">
|
||||
<label for="SupplierType">Supplier Type</label>
|
||||
 
|
||||
</div>
|
||||
<div class="col-md-1" style="margin-top:5px">
|
||||
<input type="checkbox" id="service" <?php echo $IsService; ?> name="service" value="1">
|
||||
<b>SERVICE</b>
|
||||
<input type="checkbox" id="service" name="service" <?php echo $IsService; ?> value="1"> <b>SERVICE  </b>
|
||||
</div>
|
||||
<div class="col-md-1.5" style="margin-top:5px">
|
||||
<input type="checkbox" id="rawmaterial" <?php echo $IsRawMaterial; ?> name="rawmaterial"
|
||||
value="1"> <b>RAW MATERIALS</b>
|
||||
<input type="checkbox" id="rawmaterial" name="rawmaterial" <?php echo $IsRawMaterial; ?> value="1"> <b>RAW MATERIALS  </b>
|
||||
</div>
|
||||
<div class="col-md-2" style="margin-top:5px">
|
||||
<input type="checkbox" id="maintanance" <?php echo $IsMaintanance; ?> name="maintanance"
|
||||
value="1"> <b>MAINTENANCE</b>
|
||||
<input type="checkbox" id="maintanance" name="maintanance" <?php echo $IsMaintanance; ?> value="1"> <b>MAINTENANCE  </b>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -372,64 +353,66 @@ if (!empty($supplier)) {
|
||||
<legend style="margin-left:-10px;color: #4f7c97;">Address Details</legend>
|
||||
<div class="col-md-12" style="margin-bottom: 27px;">
|
||||
<div class="form-row">
|
||||
<div class="col-md-6">
|
||||
<label for="Address2">Address<span class="badge">*</span></label>
|
||||
<textarea type="text" class="form-control" id="Address" name="Address" maxlength="500"
|
||||
required rows="3"><?php echo $Address; ?></textarea>
|
||||
<div class=" col-md-6">
|
||||
<label class="col-form-label" for="Address2">Address<span class="badge">*</span></label>
|
||||
<textarea type="text" class="form-control required" id="Address" name="Address" maxlength="500" required rows="3"><?php echo $Address; ?></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Tax Related Data -->
|
||||
<legend style="margin-left:-10px;color: #4f7c97;">Tax Related Data</legend>
|
||||
<!-- Text input-->
|
||||
<div class="col-md-12" style="margin-bottom: 27px;">
|
||||
<div class="form-row" style="margin-bottom: 20px;">
|
||||
<div class="col-md-3">
|
||||
<label for="GSTNo">GST Number</label>
|
||||
<input type="text" id="GSTNo" name="GSTNo" onchange="validateGST();" maxlength="15"
|
||||
class="form-control" value="<?php echo $GSTNO; ?>"
|
||||
pattern="([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}"
|
||||
style="text-transform:uppercase;"
|
||||
title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' Character and 1 Number (or) Character "
|
||||
onkeypress="return alphaNumberic(event)">
|
||||
<div class="form-row">
|
||||
<div class=" col-md-4">
|
||||
<label class="col-form-label" for="GSTNo">GST Number</label>
|
||||
<input type="text" id="GSTNo" name="GSTNo" class="form-control" maxlength="15" onchange="validateGST();" style="text-transform:uppercase;" pattern="([0-9]){2}([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}([0-9]){1}([Zz]){1}([A-Za-z0-9]){1}" title="Please Enter 2 Digit Number and 5 Character and 4 Digit Numbers and 1 Character and 1 Number and 'Z' and 1 Number or Character" onkeypress="return alphaNumberic(event)" value="<?php echo $GSTNO; ?>">
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label for="PAN">PAN</label>
|
||||
<input type="text" id="panno" maxlength="10" name="panno" onchange="validatePAN();"
|
||||
class="form-control" value="<?php echo $PAN; ?>"
|
||||
title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character must be in caps format)"
|
||||
pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" onkeypress="return alphaNumberic(event)"
|
||||
style="text-transform:uppercase;">
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label style="margin-bottom: 1px !important;" for="Cert_GST">Select GST
|
||||
Document<br /><small>(only .pdf, .doc, .png, .jpg)</small></label>
|
||||
<input type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_GST"
|
||||
name="Cert_GST" />
|
||||
<div class=" col-md-4">
|
||||
<label class="col-form-label" for="Cert_GST">Select GST Document<small> (only .pdf, .doc, .png, .jpg)</small></label>
|
||||
<input style="margin-top: 5px;" type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_GST" name="Cert_GST"/>
|
||||
<input type="hidden" id="hidden_Cert_GST" name="hidden_Cert_GST"
|
||||
value="<?php echo $hidden_Cert_GST; ?>" />
|
||||
|
||||
</div>
|
||||
<?php if ($hidden_Cert_GST) { ?>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-4">
|
||||
<u><a title="previously uploaded GST Document"
|
||||
href="<?php echo base_url() . 'public/uploads/images/' . $hidden_Cert_GST ?>"><span>previously
|
||||
uploaded GST Document - </span><small><?= $hidden_Cert_GST; ?></small></a></u>
|
||||
</div>
|
||||
<?php } ?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-12" style="margin-bottom: 27px;">
|
||||
<div class="form-row" style="margin-bottom: 20px;">
|
||||
<div class=" col-md-6">
|
||||
<label class="col-form-label" for="MSME">MSME</label>
|
||||
<input type="text" id="MSMENo" name="MSME" class="form-control" maxlength="30" value="<?=$MSME?>">
|
||||
<div class="form-row">
|
||||
<div class=" col-md-4">
|
||||
<label class="col-form-label" for="PAN">PAN</label>
|
||||
<input type="text" id="panno" maxlength="10" pattern="([A-Za-z]){5}([0-9]){4}([A-Za-z]){1}" name="panno" style="text-transform:uppercase;" onchange="validatePAN();" class="form-control" title="Please Enter 5 Character and 4 digit numbers and 1 Character format (Character should be in caps)" onkeypress="return alphaNumberic(event)" value="<?php echo $PAN; ?>">
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label style="margin-bottom: 1px !important;" for="Cert_MSME">Select MSME
|
||||
Document<br /><small>(only .pdf, .doc, .png, .jpg)</small></label>
|
||||
<input type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_MSME"
|
||||
name="Cert_MSME" />
|
||||
<div class=" col-md-4">
|
||||
<label class="col-form-label" for="Cert_PAN">Select PAN Document<small> (only .pdf, .doc, .png, .jpg)</small></label>
|
||||
<input style="margin-top: 5px;" type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_PAN" name="Cert_PAN" />
|
||||
<input type="hidden" id="hidden_Cert_PAN" name="hidden_Cert_PAN"
|
||||
value="<?php echo $hidden_Cert_PAN; ?>" />
|
||||
|
||||
|
||||
</div>
|
||||
<?php if ($hidden_Cert_PAN) { ?>
|
||||
<div class="col-md-4">
|
||||
<u><a title="previously uploaded PAN Document"
|
||||
href="<?php echo base_url() . 'public/uploads/images/' . $hidden_Cert_PAN ?>"><span>previously
|
||||
uploaded PAN Document - </span><small><?= $hidden_Cert_PAN; ?></small></a></u>
|
||||
</div>
|
||||
<?php } ?>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class=" col-md-4">
|
||||
<label class="col-form-label" for="MSME">MSME</label>
|
||||
<input type="text" id="MSMENo" name="MSME" class="form-control" maxlength="30" value="<?php echo $MSME; ?>">
|
||||
</div>
|
||||
<div class=" col-md-4">
|
||||
<label class="col-form-label" for="Cert_MSME">Select MSME Document<small> (only .pdf, .doc, .png, .jpg)</small></label>
|
||||
<input style="margin-top: 5px;" type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_MSME" name="Cert_MSME" />
|
||||
<input type="hidden" id="hidden_Cert_MSME" name="hidden_Cert_MSME"
|
||||
value="<?php echo $hidden_Cert_MSME; ?>" />
|
||||
</div>
|
||||
@ -443,42 +426,31 @@ if (!empty($supplier)) {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="form-row">
|
||||
|
||||
|
||||
<!-- Bank Details-->
|
||||
<legend style="margin-left:-10px;color: #4f7c97;">Bank Details</legend>
|
||||
|
||||
<!-- Bank Details Inputs -->
|
||||
<div class="col-md-12" style="margin-bottom: 27px;">
|
||||
<div class="form-row" style="margin-bottom: 20px;">
|
||||
<div class="col-md-4">
|
||||
<label for="accno">Account Number <span class="badge">*</span></label>
|
||||
<input type="text" id="accno" maxlength="20" name="accno" value="<?php echo $accno; ?>"
|
||||
class="form-control" onkeypress="return isNumberKey(event)" required>
|
||||
<div class="form-row">
|
||||
<div class=" col-md-4">
|
||||
<label class="col-form-label" for="Account_number">Account Number<span class="badge">*</span></label>
|
||||
<input type="text" id="accno" name="accno" maxlength="20" class="form-control" onkeypress="return isNumberKey(event)" required value="<?php echo $accno; ?>">
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label for="ifsc">IFSC Code <span class="badge">*</span></label>
|
||||
<input type="text" id="ifsc" name="ifsc" value="<?php echo $IFSCCode; ?>"
|
||||
class="form-control" maxlength="12" style="text-transform: uppercase" required>
|
||||
<div class=" col-md-4">
|
||||
<label class="col-form-label" for="IFSC_Code">IFSC Code<span class="badge">*</span></label>
|
||||
<input type="text" id="ifsc" name="ifsc" maxlength="12" class="form-control" onkeypress="return alpha(event)" style="text-transform: uppercase" required value="<?php echo $IFSCCode; ?>">
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label for="branchname">Bank Branch Name</label>
|
||||
<input type="text" id="branchname" name="branchname" value="<?php echo $branchname; ?>"
|
||||
class="form-control" maxlength="200">
|
||||
<div class=" col-md-4">
|
||||
<label class="col-form-label" for="Bank_Branch_Name">Bank Branch Name</label>
|
||||
<input type="text" id="branchname" name="branchname" maxlength="200" class="form-control" value="<?php echo $branchname; ?>">
|
||||
</div>
|
||||
</div>
|
||||
<!-- Bank Document Upload -->
|
||||
<div class="form-row" style="margin-bottom: 27px;">
|
||||
<div class="col-md-4">
|
||||
<label for="bankaddress">Bank Address</label>
|
||||
<input type="text" id="bankaddress" name="bankaddress" value="<?php echo $bankaddress; ?>"
|
||||
class="form-control" maxlength="200">
|
||||
<div class="form-row" style="margin-top:20px">
|
||||
<div class=" col-md-4">
|
||||
<label class="col-form-label" for="Bank_Address">Bank Address</label>
|
||||
<input type="text" id="bankaddress" name="bankaddress" maxlength="200" class="form-control" value="<?php echo $bankaddress; ?>">
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label class="col-form-label" for="Cert_BANK">Select Bank Document<small> (only .pdf, .doc,
|
||||
.png, .jpg)</small></label>
|
||||
<input type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_BANK"
|
||||
name="Cert_BANK" />
|
||||
<div class=" col-md-4">
|
||||
<label class="col-form-label" for="Cert_BANK">Select Bank Document<small> (only .pdf, .doc, .png, .jpg)</small></label>
|
||||
<input style="margin-top: 5px;" type="file" size="20" accept=".docx,.pdf,.doc,.jpg,.png" id="Cert_BANK" name="Cert_BANK" />
|
||||
<input type="hidden" id="hidden_Cert_BANK" name="hidden_Cert_BANK"
|
||||
value="<?php echo $hidden_Cert_BANK; ?>" />
|
||||
</div>
|
||||
@ -493,39 +465,37 @@ if (!empty($supplier)) {
|
||||
</u>
|
||||
</div>
|
||||
<?php } ?>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12" style="margin-bottom: 27px;">
|
||||
<div class="col-md-3">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Payment Details -->
|
||||
<legend style="margin-left:-10px;color: #4f7c97;">Payment Details</legend>
|
||||
|
||||
<!-- Payable Terms Selection -->
|
||||
<div class="col-md-12" style="margin-bottom: 27px;">
|
||||
<div class="form-row" style="margin-bottom: 20px;">
|
||||
<div class="col-md-4">
|
||||
<div class="form-row">
|
||||
<div class=" col-md-4">
|
||||
<label for="payablefrom">Payable Terms <span class="text-danger">*</span></label>
|
||||
<select class="form-control required select2" id="PaymentTerms" name="PaymentTerms"
|
||||
onchange="payment_hidden();" required>
|
||||
<option value="<?php echo $PaymentTerms; ?>"><?php echo $PaymentTerms; ?></option>
|
||||
<?php
|
||||
if (!empty($payment)) {
|
||||
foreach ($payment as $pm) { ?>
|
||||
<option value="<?php echo $pm->PaymentID; ?>"><?php echo $pm->PaymentTerms; ?></option>
|
||||
<?php
|
||||
<select class="form-control required select2" id="PaymentTerms" name="PaymentTerms"
|
||||
onchange="payment_hidden();" required>
|
||||
<option value="<?php echo $PaymentTerms; ?>"><?php echo $PaymentTerms; ?></option>
|
||||
<?php
|
||||
if (!empty($payment)) {
|
||||
foreach ($payment as $pmt) { ?>
|
||||
<option value="<?php echo $pmt->PaymentID; ?>"><?php echo $pmt->PaymentTerms; ?></option>
|
||||
<?php
|
||||
}
|
||||
}
|
||||
}
|
||||
?>
|
||||
</select>
|
||||
<input type="hidden" id="paymentid" name="paymentid" value="<?php echo $PaymentId; ?>">
|
||||
<!-- Uncomment the next line if you need the payment name in hidden input -->
|
||||
<!-- <input type="hidden" id="paymentname" name="paymentname" value="<?php echo $PaymentId; ?>"> -->
|
||||
?>
|
||||
</select>
|
||||
<input type="hidden" id="paymentid" name="paymentid" value="<?php echo $PaymentId; ?>">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
<br />
|
||||
<div class="col-md-12">
|
||||
<br />
|
||||
<div class="col-md-12">
|
||||
<div class="form-group row text-right">
|
||||
<div class="col-12">
|
||||
<button type="button" class="btn btn-secondary" onclick="history.back()">
|
||||
@ -534,9 +504,9 @@ if (!empty($supplier)) {
|
||||
<button type="button" id="updateSupplierBtnId" class="btn btn-info pull-right">Submit</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.box-footer -->
|
||||
</div>
|
||||
|
||||
|
||||
</form>
|
||||
</div> <!-- end col -->
|
||||
</div> <!-- end row -->
|
||||
@ -567,14 +537,6 @@ if (!empty($supplier)) {
|
||||
$("#supplierName").focus();
|
||||
return false;
|
||||
}
|
||||
if (!getContactNumberValidation) {
|
||||
$("#ContactNumber").focus();
|
||||
return false;
|
||||
}
|
||||
if (!validateEmail()) {
|
||||
$('#emailid').focus();
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($("#Address").val().length < 1) {
|
||||
alert('Please Enter Address');
|
||||
@ -582,6 +544,24 @@ if (!empty($supplier)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($("#accno").val().length < 1) {
|
||||
alert('Please Enter Account number');
|
||||
$("#accno").focus();
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($("#ifsc").val().length < 1) {
|
||||
alert('Please Enter Bank IFSC code');
|
||||
$("#ifsc").focus();
|
||||
return false;
|
||||
}
|
||||
|
||||
if ($("#PaymentTerms").val().length < 1) {
|
||||
alert('Please select the Payment option');
|
||||
$("#PaymentTerms").focus();
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
@ -14,30 +14,6 @@
|
||||
outline: 1px solid slategrey;
|
||||
}
|
||||
</style>
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
|
||||
// $("#InvoiceDate").datepicker({
|
||||
// maxDate: 'now',
|
||||
// dateFormat: 'dd-mm-yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true,
|
||||
// yearRange: '-100:+0'
|
||||
// });
|
||||
// $("#MaterialRcvdDate").datepicker({
|
||||
// maxDate: 'now',
|
||||
// dateFormat: 'dd-mm-yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true,
|
||||
// yearRange: '-100:+0'
|
||||
// }).datepicker("setDate", new Date());
|
||||
|
||||
});
|
||||
//jquery for vechicle masking
|
||||
// $(document).ready(function(){
|
||||
// Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
|
||||
// });
|
||||
</script>
|
||||
<div class="content-page">
|
||||
<div class="content">
|
||||
<!-- Start Content-->
|
||||
@ -106,54 +82,26 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group col-md-3">
|
||||
<label class="col-form-label">Invoice Number<span class="text-danger">*</span></label>
|
||||
<?php
|
||||
$data = array('name' => 'InvoiceNo', 'value' => set_value('InvoiceNo'), 'id' => 'InvoiceNo', 'class' => 'form-control', 'required=>"true"', 'autocomplete' => 'off'); // ,'onkeypress'=>'return isNumberKey(event);' );
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group col-md-3">
|
||||
<label class="col-form-label">Invoice Date<span class="text-danger">*</span></label>
|
||||
<div class="input-group">
|
||||
<input class="form-control" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-autoclose="true" id="InvoiceDate" name="InvoiceDate" data-date-end-date="<?= date('d/m/Y'); ?>" required autocomplete="off">
|
||||
<!-- <input type="text" class="form-control" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-autoclose="true" id="InvoiceDate" name="InvoiceDate" data-date-end-date="<?= date('d/m/Y'); ?>" required autocomplete="off"> -->
|
||||
<!-- <div class="input-group-append">
|
||||
<span class="input-group-text">
|
||||
<i class="ri-calendar-event-fill"></i>
|
||||
</span>
|
||||
</div> -->
|
||||
</div><!-- input-group -->
|
||||
|
||||
<!-- <input type="date" class="form-control" id="invoiceDate" name="invoice_date" value="<?= isset($invoice_details['invoice_date']) ? $invoice_details['invoice_date'] : '' ?>" max="<?= date('d/m/Y'); ?>" required> -->
|
||||
<?php
|
||||
// $data = array('name' => 'InvoiceDate', 'value' => set_value('InvoiceDate'), 'id' => 'InvoiceDate', 'class' => 'form-control num', 'required' => 'true', 'autocomplete' => 'off');
|
||||
// echo form_input($data);
|
||||
?>
|
||||
<input class="form-control" data-provide="datepicker" data-date-format="dd-mm-yyyy" data-date-autoclose="true" id="InvoiceDate" name="InvoiceDate" data-date-end-date="<?= date('d-m-Y'); ?>" required autocomplete="off">
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group col-md-3">
|
||||
<label class="col-form-label">Material Received Date<span class="text-danger">*</span></label>
|
||||
<div class="input-group">
|
||||
<input class="form-control" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-autoclose="true" id="MaterialRcvdDate" name="MaterialRcvdDate" data-date-end-date="<?= date('d/m/Y'); ?>" required autocomplete="off">
|
||||
<!-- <input type="text" class="form-control" data-provide="datepicker" data-date-format="dd/mm/yyyy" data-date-autoclose="true" id="MaterialRcvdDate" name="MaterialRcvdDate" data-date-end-date="<?= date('d/m/Y'); ?>" required autocomplete="off">
|
||||
<div class="input-group-append">
|
||||
<span class="input-group-text">
|
||||
<i class="ri-calendar-event-fill"></i>
|
||||
</span>
|
||||
</div> -->
|
||||
</div>
|
||||
<?php
|
||||
// $data = array('name' => 'MaterialRcvdDate', 'value' => set_value('MaterialRcvdDate'), 'id' => 'MaterialRcvdDate', 'class' => 'form-control num', 'required' => 'true', 'autocomplete' => 'off');
|
||||
// echo form_input($data);
|
||||
?>
|
||||
<input class="form-control" data-provide="datepicker" data-date-format="dd-mm-yyyy" data-date-autoclose="true" id="MaterialRcvdDate" name="MaterialRcvdDate" data-date-end-date="<?= date('d-m-Y'); ?>" required autocomplete="off">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group col-md-3">
|
||||
|
||||
<label class="col-form-label">Vechicle Number</label>
|
||||
<?php
|
||||
@ -161,7 +109,10 @@
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
</div>
|
||||
<div class="form-row">
|
||||
|
||||
<div class="form-group col-md-3">
|
||||
<label class="col-form-label">Transporter Name</label>
|
||||
<?php
|
||||
$option = array(0 => 'Transporter Name');
|
||||
@ -174,7 +125,7 @@
|
||||
|
||||
?>
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group col-md-3">
|
||||
<label class="col-form-label">Driver Name</label>
|
||||
<?php
|
||||
$data = array('name' => 'DriverName', 'value' => set_value('DriverName'), 'id' => 'DriverName', 'class' => 'form-control', 'maxlength' => '50', 'autocomplete' => 'off','list' => 'driverlist','onchange' => "fetchMobileNumber(this.value)");
|
||||
@ -186,13 +137,20 @@
|
||||
echo '</datalist>';
|
||||
?>
|
||||
</div>
|
||||
<div class="form-group col-md-4">
|
||||
<div class="form-group col-md-3">
|
||||
<label class="col-form-label">Driver Mobile Number</label>
|
||||
<?php
|
||||
$data = array('name' => 'DriverMobileNumber', 'value' => set_value('DriverMobileNumber'), 'id' => 'DriverMobileNumber', 'class' => 'form-control', 'autocomplete' => 'off', 'maxlength'=>'10');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
<div class="form-group col-md-3">
|
||||
<label class="col-form-label">Remarks</label>
|
||||
<?php
|
||||
$data = array('name' => 'MasterRemarks', 'value' => set_value('MasterRemarks'), 'id' => 'MasterRemarks', 'class' => 'form-control', 'autocomplete' => 'off','rows' => 3);
|
||||
echo form_textarea($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-row">
|
||||
<div class="table-responsive">
|
||||
@ -201,7 +159,7 @@
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>Item Code</th>
|
||||
<th>Material</th>
|
||||
<th>Item Description</th>
|
||||
<th>Rate</th>
|
||||
<th>UOM</th>
|
||||
<th>Ordered Quantity</th>
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
<!-- Flatpickr CSS -->
|
||||
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css">
|
||||
<!-- Flatpickr JS -->
|
||||
<script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
|
||||
<style>
|
||||
|
||||
|
||||
@ -97,14 +101,14 @@
|
||||
var mindt = year - 70;
|
||||
var maxdt = year - 15;
|
||||
|
||||
$("#Invoice_Date , #MaterialRcvdDate").datepicker({
|
||||
minDate: new Date(year - SIAStartYear, 1, 1),
|
||||
maxDate: 'now',
|
||||
dateFormat: 'dd-mm-yy',
|
||||
changeMonth: true,
|
||||
changeYear: true,
|
||||
yearRange: '-100:+0'
|
||||
});
|
||||
// $("#Invoice_Date , #MaterialRcvdDate").datepicker({
|
||||
// minDate: new Date(year - SIAStartYear, 1, 1),
|
||||
// maxDate: 'now',
|
||||
// dateFormat: 'dd-mm-yy',
|
||||
// changeMonth: true,
|
||||
// changeYear: true,
|
||||
// yearRange: '-100:+0'
|
||||
// });
|
||||
});
|
||||
</script>
|
||||
<style>
|
||||
@ -305,8 +309,8 @@
|
||||
<!-- box closed here -->
|
||||
|
||||
|
||||
<!-- Right modal content -->
|
||||
<div id="right-modal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
|
||||
<!-- modal1 - IGR Remarks modal -->
|
||||
<div id="right-modal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
|
||||
<div class="modal-dialog modal-sm modal-right">
|
||||
<div class="modal-content">
|
||||
<div class="modal-header border-0">
|
||||
@ -325,9 +329,10 @@
|
||||
</div>
|
||||
</div><!-- /.modal-content -->
|
||||
</div><!-- /.modal-dialog -->
|
||||
</div><!-- /.modal -->
|
||||
</div>
|
||||
<!-- /.modal fade closed (IGR Remarks)-->
|
||||
|
||||
<!-- Igr modal fade -->
|
||||
<!-- modal2 - Edit Igr modal -->
|
||||
<div id="Igrshow" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
||||
<div class="modal-dialog modal-full-width">
|
||||
|
||||
@ -382,19 +387,13 @@
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<label class="col-form-label">Invoice Date <span class="text-danger">*</span></label>
|
||||
<?php
|
||||
$data = array('name' => 'InvoiceDate', 'value' => set_value('InvoiceDate'), 'id' => 'Invoice_Date', 'class' => 'form-control', 'required=>"true"');
|
||||
echo form_input($data);
|
||||
?>
|
||||
<input type="date" class="form-control" id="InvoiceDate" name="InvoiceDate" required autocomplete="off">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<label class="col-form-label">Material Received Date <span class="text-danger">*</span></label>
|
||||
<?php
|
||||
$data = array('name' => 'MaterialRcvdDate', 'value' => set_value('MaterialRcvdDate'), 'id' => 'MaterialRcvdDate', 'class' => 'form-control');
|
||||
echo form_input($data);
|
||||
?>
|
||||
<input type="date" class="form-control" id="MaterialRcvdDate" name="MaterialRcvdDate" required autocomplete="off">
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
@ -451,6 +450,15 @@
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
<label class="col-form-label">Remarks</label>
|
||||
<?php
|
||||
$data = array('name' => 'MasterRemarks', 'value' => set_value('MasterRemarks'), 'id' => 'MasterRemarks', 'class' => 'form-control', 'autocomplete' => 'off','rows' => 3);
|
||||
echo form_textarea($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
@ -459,15 +467,15 @@
|
||||
<table id="Inwardgateregistertable1" class="table table-striped table-hover mb-0 editabletable IGR_Line" style="font-size:12px;">
|
||||
<thead style="background-color:#ddd !important">
|
||||
<tr>
|
||||
<th style="width: 50px;">SNo</th>
|
||||
<th style="width: 50px;">#</th>
|
||||
<th style="width: 100px;">Item Code</th>
|
||||
<th style="width: 150px; word-wrap: break-word; word-break: break-all; white-space: normal;">Item Description</th>
|
||||
<th style="width: 50px;">Rate</th>
|
||||
<th style="width: 50px;">Tax (%)</th>
|
||||
<th style="width: 50px;">UOM</th>
|
||||
<th style="width: 100px;">Ordered Qty</th>
|
||||
<th style="width: 100px;">Received Qty</th>
|
||||
<th id="pendingQuantityHeader" style="display:none; width: 100px;">Pending Qty</th>
|
||||
<th style="width: 50px;">Rate</th>
|
||||
<th style="width: 50px;">Tax (%)</th>
|
||||
<th style="width: 50px;">Taxable Amt</th>
|
||||
<th style="width: 50px;">Total Amt</th>
|
||||
<th style="width: 150px;">Remarks</th>
|
||||
@ -537,10 +545,9 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- /.modal Igr modal fade closed-->
|
||||
<!-- /.modal fade closed (Edit Igr)-->
|
||||
|
||||
|
||||
<!-- WeightCalculator modal fade -->
|
||||
<!-- modal3 - Weight Calculator modal -->
|
||||
<div id="WeightCalculator" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog modal-lg">
|
||||
@ -616,10 +623,10 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div><!-- /.modal -->
|
||||
</div>
|
||||
<!-- /.modal fade closed (Weight Calculator)-->
|
||||
|
||||
|
||||
<!-- WeightCalculator modal fade closed-->
|
||||
<!-- modal4 - IGR history modal -->
|
||||
<div id="Historyshow" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog">
|
||||
@ -642,10 +649,10 @@
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div><!-- /.modal -->
|
||||
</div>
|
||||
<!-- /.modal fade closed (IGR history)-->
|
||||
|
||||
|
||||
<!-- History modal fade closed-->
|
||||
<!-- modal5 - Cost Center modal -->
|
||||
<div id="CostCentershow" class="modal fade" tabindex="-1" role="dialog"
|
||||
aria-labelledby="myModalLabel" aria-hidden="true" style="display: none;">
|
||||
<div class="modal-dialog">
|
||||
@ -669,9 +676,7 @@
|
||||
</div>
|
||||
</div>
|
||||
</div><!-- /.modal -->
|
||||
<!-- History modal fade closed-->
|
||||
|
||||
|
||||
<!-- /.modal fade closed (Cost Center)-->
|
||||
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
@ -795,7 +800,7 @@
|
||||
// alert(igrstatus);
|
||||
var buttonContainer = $(".buttonContainer");
|
||||
var modal = $(this); // Reference to the modal itself
|
||||
var invoiceDateInput = modal.find('#Invoice_Date');
|
||||
var invoiceDateInput = modal.find('#InvoiceDate');
|
||||
var invoiceNoInput = modal.find('#Invoice_No');
|
||||
var MaterialRcvdDateInput = modal.find('#MaterialRcvdDate');
|
||||
var VehicleNoInput = modal.find('#Vehicle_No');
|
||||
@ -848,6 +853,8 @@
|
||||
|
||||
var parsedData = JSON.parse(data);
|
||||
console.log(parsedData);
|
||||
flatpickr("#InvoiceDate", { dateFormat: "d-m-Y",});
|
||||
flatpickr("#MaterialRcvdDate", { dateFormat: "d-m-Y",});
|
||||
if (parsedData['details'].length === 0) {
|
||||
console.log("No data available");
|
||||
// Reset all relevant fields and table
|
||||
@ -866,8 +873,9 @@
|
||||
$("#Supplier").val('');
|
||||
$("#Add1").val('');
|
||||
$("#Invoice_No").val('');
|
||||
$("#Invoice_Date").val('');
|
||||
$("#InvoiceDate").val('');
|
||||
$("#MaterialRcvdDate").val('');
|
||||
$("#MasterRemarks").val('');
|
||||
$("#ser").val('');
|
||||
$("#tbleIGRAppend").empty(); // Clear the table
|
||||
// Hide the MasterFileLabel if no data
|
||||
@ -923,7 +931,7 @@
|
||||
// Format dates
|
||||
var dcd = new Date(item.DeliveryChellanDate);
|
||||
var dcd2 = (String(dcd.getDate()).padStart(2, '0') + '-' + (String(dcd.getMonth() + 1).padStart(2, '0')) + '-' + dcd.getFullYear());
|
||||
$("#Invoice_Date").val(dcd2);
|
||||
$("#InvoiceDate").val(dcd2);
|
||||
console.log(item.MaterialRcvdDate)
|
||||
var Mat_rcv_date = (item.MaterialRcvdDate == 'null') ? ' ' : formatDateTime(item.MaterialRcvdDate, 1);
|
||||
$("#MaterialRcvdDate").val(Mat_rcv_date);
|
||||
@ -943,12 +951,15 @@
|
||||
'<td style="width: 50px;" >' + i + '</td>' +
|
||||
'<td style="width: 100px;" name="MaterialName" onchange="test(' + i + ')">' + item.MaterialCode + '</td>' +
|
||||
'<td style="width: 150px; word-wrap: break-word; word-break: break-all; white-space: normal;">' + item.MaterialName + '</td>' +
|
||||
'<td style="width: 50px;" name="Rate" id="Rate" >' + Number(item.Rate).toFixed(2) + '</td>' +
|
||||
'<td style="width: 50px;" name="tax">' + tax_percentage + '</td>' +
|
||||
'<td style="width: 50px;" name="UOM">' + item.UOM + '</td>' +
|
||||
'<td style="width: 100px;" id="Quantity' + i + '" name="Quantity">' + parseInt(item.Quantity) + '</td>' +
|
||||
'<td style="width: 100px;" data-name="sel" ><input type="text" onchange="validateReceivedQuantity(' + i + ',' + isOpenOrder + ')"id="QuantityAsPerInvoice' + i + '" name="QuantityAsPerInvoice' + i + '" value="' + parseInt(item.QuantityAsPerInvoice) + '" onkeypress="return isNumberKey(event);" style="width: 75px;"></td>' +
|
||||
'<td style="width: 100px;" name="PendingQuantity' + i + '" id="PendingQuantity' + i + '">' + ((isOpenOrder) ? 0 : parseInt(item.Quantity - item.QuantityAsPerInvoice)) + '</td>' +
|
||||
'<td style="width: 50px;" name="Rate" id="Rate" >' + Number(item.Rate).toFixed(2) + '</td>' +
|
||||
'<td style="width: 50px;" name="tax">' + tax_percentage + '</td>' +
|
||||
|
||||
|
||||
|
||||
'<td style="width: 50px;" name="amount">' + amount + '</td>' +
|
||||
'<td style="width: 50px;" name="tax_amount">' + total_with_tax + '</td>' +
|
||||
'<td style="width: 100px;"><input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form" onchange="SetRemarks(' + i + ')" style="width: 75px;"> </td>' +
|
||||
@ -986,12 +997,15 @@
|
||||
'<td style="width: 50px;" >' + i + '</td>' +
|
||||
'<td style="width: 100px;" name="MaterialName" onchange="test(' + i + ')">' + item.MaterialCode + '</td>' +
|
||||
'<td style="width: 150px; word-wrap: break-word; word-break: break-all; white-space: normal;">' + item.MaterialName + '</td>' +
|
||||
'<td style="width: 50px;" name="Rate" id="Rate" >' + Number(item.Rate).toFixed(2) + '</td>' +
|
||||
'<td style="width: 50px;" name="tax">' + tax_percentage + '</td>' +
|
||||
'<td style="width: 50px;" name="UOM">' + item.UOM + '</td>' +
|
||||
'<td style="width: 100px;" id="Quantity' + i + '" name="Quantity">' + parseInt(item.Quantity) + '</td>' +
|
||||
'<td style="width: 100px;" data-name="sel" ><input type="text" onchange="validateReceivedQuantity(' + i + ',' + isOpenOrder + ')"id="QuantityAsPerInvoice' + i + '" name="QuantityAsPerInvoice' + i + '" value="' + parseInt(item.QuantityAsPerInvoice) + '" onkeypress="return isNumberKey(event);" style="width: 75px;"></td>' +
|
||||
'<td style="width: 100px;" name="PendingQuantity' + i + '" id="PendingQuantity' + i + '">' + ((isOpenOrder) ? 0 : parseInt(item.Quantity - item.QuantityAsPerInvoice)) + '</td>' +
|
||||
'<td style="width: 50px;" name="Rate" id="Rate" >' + Number(item.Rate).toFixed(2) + '</td>' +
|
||||
'<td style="width: 50px;" name="tax">' + tax_percentage + '</td>' +
|
||||
|
||||
|
||||
|
||||
'<td style="width: 50px;" name="amount">' + amount + '</td>' +
|
||||
'<td style="width: 50px;" name="tax_amount">' + total_with_tax + '</td>' +
|
||||
'<td style="width: 100px;"><input type="text" id="Remark' + i + '" name="Remark' + i + '" class="form" onchange="SetRemarks(' + i + ')" style="width: 75px;"> </td>' +
|
||||
@ -1026,11 +1040,13 @@
|
||||
'<td style="width: 50px;" >' + i + '</td>' +
|
||||
'<td style="width: 100px;" name="MaterialName" id="MaterialCode" onchange="test(' + i + ')">' + item.MaterialCode + '</td>' +
|
||||
'<td style="width: 150px; word-wrap: break-word; word-break: break-all; white-space: normal;">' + item.MaterialName + '</td>' +
|
||||
'<td style="width: 50px;" name="Rate" id="Rate" >' + Number(item.Rate).toFixed(2) + '</td>' +
|
||||
'<td style="width: 50px;" name="tax">' + tax_percentage + '</td>' +
|
||||
'<td style="width: 50px;" name="UOM">' + item.UOM + '</td>' +
|
||||
'<td style="width: 100px;" name="Quantity">' + item.Quantity + '</td>' +
|
||||
'<td style="width: 100px;" data-name="sel" >' + item.QuantityAsPerInvoice + '</td>' +
|
||||
'<td style="width: 50px;" name="Rate" id="Rate" >' + Number(item.Rate).toFixed(2) + '</td>' +
|
||||
'<td style="width: 50px;" name="tax">' + tax_percentage + '</td>' +
|
||||
|
||||
|
||||
'<td style="width: 50px;" name="tax_amount">' + total_with_tax + '</td>' +
|
||||
'<td style="width: 50px;" name="amount">' + amount + '</td>' +
|
||||
'<td style="width: 50px;" name="tax_amount">' + total_with_tax + '</td>' +
|
||||
@ -1099,7 +1115,7 @@
|
||||
// $('#content').loader('show');
|
||||
var igrno = $("#IGRNO1").val();
|
||||
var materialrcv_date = $("#MaterialRcvdDate").val();
|
||||
var inv_date = $("#Invoice_Date").val();
|
||||
var inv_date = $("#InvoiceDate").val();
|
||||
|
||||
$.ajax({
|
||||
data: {
|
||||
@ -1146,7 +1162,7 @@
|
||||
formData.append('po', pono);
|
||||
formData.append('mrc', $("#MaterialRcvdDate").val());
|
||||
formData.append('invno', $("#Invoice_No").val());
|
||||
formData.append('invdate', $("#Invoice_Date").val());
|
||||
formData.append('invdate', $("#InvoiceDate").val());
|
||||
formData.append('vehicle_no', $('#Vehicle_No').val());
|
||||
formData.append('Transporter_Id', $('#Transporter_Id').val());
|
||||
formData.append('driver', $('#Driver_Name').val());
|
||||
@ -1206,7 +1222,7 @@
|
||||
formData.append('po', pono);
|
||||
formData.append('mrc', $("#MaterialRcvdDate").val());
|
||||
formData.append('invno', $("#Invoice_No").val());
|
||||
formData.append('invdate', $("#Invoice_Date").val());
|
||||
formData.append('invdate', $("#InvoiceDate").val());
|
||||
formData.append('vehicle_no', $('#Vehicle_No').val());
|
||||
formData.append('Transporter_Id', $('#Transporter_Id').val());
|
||||
formData.append('driver', $('#Driver_Name').val());
|
||||
@ -1215,6 +1231,8 @@
|
||||
formData.append('tableData', JSON.stringify(tableData));
|
||||
formData.append('isOpenOrder', $("#hiddenIsOpenOrder").val());
|
||||
formData.append('MasterFile', $('#MasterFile')[0].files[0]);
|
||||
formData.append('MasterRemarks', $("#MasterRemarks").val());
|
||||
|
||||
|
||||
$('input[name="file_name[]"]').each(function() {
|
||||
formData.append('file_name[]', $(this).val());
|
||||
|
||||
Loading…
Reference in New Issue
Block a user