reorder and link creation for suppler
This commit is contained in:
venbatechnologies
parent
46cb57b1d9
commit
e4847e4918
@ -331,5 +331,5 @@ $route['qualityreportlistinward'] = "quality/reportListInward";
|
|||||||
|
|
||||||
/* End of file routes.php */
|
/* End of file routes.php */
|
||||||
/* Location: ./application/config/routes.php */
|
/* Location: ./application/config/routes.php */
|
||||||
|
$route['shortagematerialListing'] = 'rawmaterialdetails/shortagematerialListing';
|
||||||
|
|
||||||
|
|||||||
@ -18,6 +18,7 @@ class batchcard extends BaseController
|
|||||||
{
|
{
|
||||||
parent::__construct();
|
parent::__construct();
|
||||||
$this->load->model('batchcard_model');
|
$this->load->model('batchcard_model');
|
||||||
|
$this->load->model('inwardgateregister_model');
|
||||||
$this->isLoggedIn();
|
$this->isLoggedIn();
|
||||||
$this->load->helper(array('form','url'));
|
$this->load->helper(array('form','url'));
|
||||||
date_default_timezone_set('Asia/Kolkata');
|
date_default_timezone_set('Asia/Kolkata');
|
||||||
@ -217,6 +218,42 @@ class batchcard extends BaseController
|
|||||||
|
|
||||||
$historyadd = $this->batchcard_model->AddMaterialHistory($historytable);
|
$historyadd = $this->batchcard_model->AddMaterialHistory($historytable);
|
||||||
|
|
||||||
|
$get_pre_qty= $this->inwardgateregister_model->get_CurrentQty($materialcode);
|
||||||
|
$av_qty=0;
|
||||||
|
if(!empty($get_pre_qty))
|
||||||
|
{
|
||||||
|
foreach($get_pre_qty as $gt)
|
||||||
|
{
|
||||||
|
$av_qty=$gt->Current_stock;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if($status == 'Add')
|
||||||
|
{
|
||||||
|
$currentav_qty=$av_qty+$absaluteQty;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
else if($status == 'Reduce')
|
||||||
|
{
|
||||||
|
|
||||||
|
$currentav_qty=$av_qty-$absaluteQty;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
$current_qty= array('Current_stock'=>$currentav_qty);
|
||||||
|
|
||||||
|
$this->inwardgateregister_model->addmaterialmaster($current_qty,$materialcode);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if((count($materialadjust)>0) &&(count($historyadd)))
|
if((count($materialadjust)>0) &&(count($historyadd)))
|
||||||
{
|
{
|
||||||
@ -288,10 +325,29 @@ class batchcard extends BaseController
|
|||||||
$rawarray =array('FPId'=>$final_product_id,'MaterialCode'=>$rawmaterial,'SupplierID'=>$rawsupplier,'Quantity'=>$rawqty,'Price'=>$rawvalue,'CreatedBy'=>$createdby,'CreatedDate'=>$createddt);
|
$rawarray =array('FPId'=>$final_product_id,'MaterialCode'=>$rawmaterial,'SupplierID'=>$rawsupplier,'Quantity'=>$rawqty,'Price'=>$rawvalue,'CreatedBy'=>$createdby,'CreatedDate'=>$createddt);
|
||||||
|
|
||||||
$rawmaterialhistory= array('MaterialCode'=>$rawmaterial,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$final_product_id,'SupplierID'=>$rawsupplier,'Quantity'=>$rawqty,'ItemValue'=>$rawvalue,'CreatedBy'=>$createdby,'CreatedOn'=>$createddt);
|
$rawmaterialhistory= array('MaterialCode'=>$rawmaterial,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$final_product_id,'SupplierID'=>$rawsupplier,'Quantity'=>$rawqty,'ItemValue'=>$rawvalue,'CreatedBy'=>$createdby,'CreatedOn'=>$createddt);
|
||||||
|
//$rawmaterialhistory= array('MaterialCode'=>$rawmaterial,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$final_product_id,'SupplierID'=>$rawsupplier,'Quantity'=>$rawqty,'ItemValue'=>$rawvalue,'CreatedBy'=>$CreatedBy,'CreatedOn'=>$createddt);
|
||||||
|
|
||||||
$this->batchcard_model->save_rawmaterialto_materialHistory($rawmaterialhistory);
|
$this->batchcard_model->save_rawmaterialto_materialHistory($rawmaterialhistory);
|
||||||
|
|
||||||
// print_r($rawarray);
|
|
||||||
|
$rawget_pre_qty= $this->inwardgateregister_model->get_CurrentQty($rawmaterial);
|
||||||
|
$av_qty=0;
|
||||||
|
if(!empty($rawget_pre_qty))
|
||||||
|
{
|
||||||
|
foreach($rawget_pre_qty as $gt)
|
||||||
|
{
|
||||||
|
$av_qty=$gt->Current_stock;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$currentav_qty=$av_qty-$rawqty;
|
||||||
|
|
||||||
|
|
||||||
|
$current_qty= array('Current_stock'=>$currentav_qty);
|
||||||
|
|
||||||
|
$this->inwardgateregister_model->addmaterialmaster($current_qty,$rawmaterial);
|
||||||
|
//print_r($rawarray); // print_r($rawarray);
|
||||||
|
|
||||||
// print_r($rawmaterialhistory);
|
// print_r($rawmaterialhistory);
|
||||||
|
|
||||||
$this->batchcard_model->save_finalraw($rawarray);
|
$this->batchcard_model->save_finalraw($rawarray);
|
||||||
@ -310,6 +366,22 @@ class batchcard extends BaseController
|
|||||||
$consuhistory= array('MaterialCode'=>$conmaterial,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$final_product_id,'SupplierID'=>$consupplier,'Quantity'=>$conqty,'ItemValue'=>$convalue,'CreatedBy'=>$createdby,'CreatedOn'=>$createddt);
|
$consuhistory= array('MaterialCode'=>$conmaterial,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$final_product_id,'SupplierID'=>$consupplier,'Quantity'=>$conqty,'ItemValue'=>$convalue,'CreatedBy'=>$createdby,'CreatedOn'=>$createddt);
|
||||||
|
|
||||||
$this->batchcard_model->save_rawmaterialto_materialHistory($consuhistory);
|
$this->batchcard_model->save_rawmaterialto_materialHistory($consuhistory);
|
||||||
|
$conget_pre_qty= $this->inwardgateregister_model->get_CurrentQty($conmaterial);
|
||||||
|
$conav_qty=0;
|
||||||
|
if(!empty($conget_pre_qty))
|
||||||
|
{
|
||||||
|
foreach($conget_pre_qty as $gt)
|
||||||
|
{
|
||||||
|
$conav_qty=$gt->Current_stock;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$concurrentav_qty=$conav_qty-$conqty;
|
||||||
|
|
||||||
|
|
||||||
|
$concurrent_qty= array('Current_stock'=>$concurrentav_qty);
|
||||||
|
|
||||||
|
$this->inwardgateregister_model->addmaterialmaster($concurrent_qty,$conmaterial);
|
||||||
|
|
||||||
$this->batchcard_model->save_finalcon($conarray);
|
$this->batchcard_model->save_finalcon($conarray);
|
||||||
}
|
}
|
||||||
@ -327,6 +399,23 @@ class batchcard extends BaseController
|
|||||||
$packmathistory= array('MaterialCode'=>$packmaterial,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$final_product_id,'SupplierID'=>$packsupplier,'Quantity'=>$packqty,'ItemValue'=>$packvalue,'CreatedBy'=>$createdby,'CreatedOn'=>$createddt);
|
$packmathistory= array('MaterialCode'=>$packmaterial,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$final_product_id,'SupplierID'=>$packsupplier,'Quantity'=>$packqty,'ItemValue'=>$packvalue,'CreatedBy'=>$createdby,'CreatedOn'=>$createddt);
|
||||||
|
|
||||||
$this->batchcard_model->save_rawmaterialto_materialHistory($packmathistory);
|
$this->batchcard_model->save_rawmaterialto_materialHistory($packmathistory);
|
||||||
|
$pacget_pre_qty= $this->inwardgateregister_model->get_CurrentQty($packmaterial);
|
||||||
|
$pacav_qty=0;
|
||||||
|
if(!empty($pacget_pre_qty))
|
||||||
|
{
|
||||||
|
foreach($pacget_pre_qty as $gt)
|
||||||
|
{
|
||||||
|
$pacav_qty=$gt->Current_stock;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$paccurrentav_qty=$pacav_qty-$packqty;
|
||||||
|
|
||||||
|
|
||||||
|
$paccurrent_qty= array('Current_stock'=>$paccurrentav_qty);
|
||||||
|
|
||||||
|
$this->inwardgateregister_model->addmaterialmaster($paccurrent_qty,$packmaterial);
|
||||||
|
|
||||||
|
|
||||||
$this->batchcard_model->save_finalpacking($packarray);
|
$this->batchcard_model->save_finalpacking($packarray);
|
||||||
}
|
}
|
||||||
@ -407,7 +496,7 @@ class batchcard extends BaseController
|
|||||||
$rawqty = $this->input->post('rawQty'.$i);
|
$rawqty = $this->input->post('rawQty'.$i);
|
||||||
$rawvalue = $this->input->post('rawprice'.$i);
|
$rawvalue = $this->input->post('rawprice'.$i);
|
||||||
$rawilneno = $this->input->post('RawId'.$i);
|
$rawilneno = $this->input->post('RawId'.$i);
|
||||||
//echo $rawilneno;
|
$beforawqty = $this->input->post('beforerawQty'.$i); //echo $rawilneno;
|
||||||
if($rawmaterial == '' && $rawsupplier == '' & $rawqty == '')
|
if($rawmaterial == '' && $rawsupplier == '' & $rawqty == '')
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -417,17 +506,56 @@ class batchcard extends BaseController
|
|||||||
{
|
{
|
||||||
|
|
||||||
$rawarray =array('FPId'=>$FPID,'MaterialCode'=>$rawmaterial,'SupplierID'=>$rawsupplier,'Quantity'=>$rawqty,'Price'=>$rawvalue,'CreatedBy'=>$createdby,'CreatedDate'=>$createddt);
|
$rawarray =array('FPId'=>$FPID,'MaterialCode'=>$rawmaterial,'SupplierID'=>$rawsupplier,'Quantity'=>$rawqty,'Price'=>$rawvalue,'CreatedBy'=>$createdby,'CreatedDate'=>$createddt);
|
||||||
|
$rawmaterialhistory= array('MaterialCode'=>$rawmaterial,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$FPID,'SupplierID'=>$rawsupplier,'Quantity'=>$rawqty,'ItemValue'=>$rawvalue,'CreatedBy'=>$CreatedBy,'CreatedOn'=>$createddt);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$rawmaterialhistory= array('MaterialCode'=>$rawmaterial,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$FPID,'SupplierID'=>$rawsupplier,'Quantity'=>$rawqty,'ItemValue'=>$rawvalue,'CreatedBy'=>$createdby,'CreatedOn'=>$createddt);
|
|
||||||
|
|
||||||
|
|
||||||
$checkrawid=$this->batchcard_model->GetRawid($rawilneno);
|
$checkrawid=$this->batchcard_model->GetRawid($rawilneno);
|
||||||
|
|
||||||
$checkrawhistory = $this->batchcard_model->GetRawCheck($rawmaterial,$FPID);
|
$checkrawhistory = $this->batchcard_model->GetRawCheck($rawmaterial,$FPID);
|
||||||
|
|
||||||
|
|
||||||
|
$rawget_pre_qty= $this->inwardgateregister_model->get_CurrentQty($rawmaterial);
|
||||||
|
$av_qty=0;
|
||||||
|
if(!empty($rawget_pre_qty))
|
||||||
|
{
|
||||||
|
foreach($rawget_pre_qty as $gt)
|
||||||
|
{
|
||||||
|
$av_qty=$gt->Current_stock;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// echo $av_qty;
|
||||||
|
// die();
|
||||||
|
$qty_dif= $rawqty - $beforawqty;
|
||||||
|
//echo $qty_dif;
|
||||||
|
|
||||||
|
// if($qty_dif >0)
|
||||||
|
// {
|
||||||
|
// echo 'if';
|
||||||
|
// $currentav_qty=$av_qty+$qty_dif;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// else
|
||||||
|
// {
|
||||||
|
// echo 'else';
|
||||||
|
$currentav_qty=$av_qty-$qty_dif;
|
||||||
|
// }
|
||||||
|
|
||||||
|
//echo $currentav_qty;
|
||||||
|
//die();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
$current_qty= array('Current_stock'=>$currentav_qty);
|
||||||
|
|
||||||
|
//print($current_qty);
|
||||||
|
|
||||||
|
$this->inwardgateregister_model->addmaterialmaster($current_qty,$rawmaterial);
|
||||||
|
// $checkrawid=$this->batchcard_model->GetRawid($rawilneno);
|
||||||
|
|
||||||
|
// $checkrawhistory = $this->batchcard_model->GetRawCheck($rawmaterial,$FPID);
|
||||||
|
|
||||||
// echo $checkrawhistory;
|
// echo $checkrawhistory;
|
||||||
|
|
||||||
|
|
||||||
@ -458,7 +586,7 @@ class batchcard extends BaseController
|
|||||||
$conqty = $this->input->post('consumeQty'.$i);
|
$conqty = $this->input->post('consumeQty'.$i);
|
||||||
$convalue = $this->input->post('consumeprice'.$i);
|
$convalue = $this->input->post('consumeprice'.$i);
|
||||||
$consuline = $this->input->post('Consumable'.$i);
|
$consuline = $this->input->post('Consumable'.$i);
|
||||||
|
$beforeconqty = $this->input->post('beforeconsumeQty'.$i);
|
||||||
if($conmaterial == '' && $consupplier == '' & $conqty == '')
|
if($conmaterial == '' && $consupplier == '' & $conqty == '')
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -473,6 +601,39 @@ class batchcard extends BaseController
|
|||||||
|
|
||||||
|
|
||||||
$checkconsuid=$this->batchcard_model->Getconsuid($consuline);
|
$checkconsuid=$this->batchcard_model->Getconsuid($consuline);
|
||||||
|
$conget_pre_qty= $this->inwardgateregister_model->get_CurrentQty($conmaterial);
|
||||||
|
$conav_qty=0;
|
||||||
|
if(!empty($conget_pre_qty))
|
||||||
|
{
|
||||||
|
foreach($conget_pre_qty as $gt)
|
||||||
|
{
|
||||||
|
$conav_qty=$gt->Current_stock;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
$conqty_dif= $conqty - $beforeconqty;
|
||||||
|
|
||||||
|
// if($conqty_dif >0)
|
||||||
|
// {
|
||||||
|
// $concurrentav_qty=$conav_qty+$conqty_dif;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// else
|
||||||
|
// {
|
||||||
|
$concurrentav_qty=$conav_qty-$conqty_dif;
|
||||||
|
//}
|
||||||
|
|
||||||
|
|
||||||
|
// $concurrentav_qty=$conav_qty-$conqty;
|
||||||
|
|
||||||
|
|
||||||
|
$concurrent_qty= array('Current_stock'=>$concurrentav_qty);
|
||||||
|
|
||||||
|
$this->inwardgateregister_model->addmaterialmaster($concurrent_qty,$conmaterial);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(count($checkconsuid)>0)
|
if(count($checkconsuid)>0)
|
||||||
{
|
{
|
||||||
@ -500,7 +661,7 @@ class batchcard extends BaseController
|
|||||||
$packqty = $this->input->post('packQty'.$i);
|
$packqty = $this->input->post('packQty'.$i);
|
||||||
$packvalue = $this->input->post('packprice'.$i);
|
$packvalue = $this->input->post('packprice'.$i);
|
||||||
$packlineId = $this->input->post('packId'.$i);
|
$packlineId = $this->input->post('packId'.$i);
|
||||||
|
$beforepacqty = $this->input->post('beforepackQty'.$i);
|
||||||
if($packmaterial == '' && $packsupplier == '' & $packqty == '')
|
if($packmaterial == '' && $packsupplier == '' & $packqty == '')
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -514,6 +675,38 @@ class batchcard extends BaseController
|
|||||||
$packmathistory= array('MaterialCode'=>$packmaterial,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$FPID,'SupplierID'=>$packsupplier,'Quantity'=>$packqty,'ItemValue'=>$packvalue,'CreatedBy'=>$createdby,'CreatedOn'=>$createddt);
|
$packmathistory= array('MaterialCode'=>$packmaterial,'Transaction_type'=>'Reduce','Ref_Type'=>'Final Product','Ref_No'=>$FPID,'SupplierID'=>$packsupplier,'Quantity'=>$packqty,'ItemValue'=>$packvalue,'CreatedBy'=>$createdby,'CreatedOn'=>$createddt);
|
||||||
|
|
||||||
$checkpackid=$this->batchcard_model->Getpackid($packlineId);
|
$checkpackid=$this->batchcard_model->Getpackid($packlineId);
|
||||||
|
$pacget_pre_qty= $this->inwardgateregister_model->get_CurrentQty($packmaterial);
|
||||||
|
$pacav_qty=0;
|
||||||
|
if(!empty($pacget_pre_qty))
|
||||||
|
{
|
||||||
|
foreach($pacget_pre_qty as $gt)
|
||||||
|
{
|
||||||
|
$pacav_qty=$gt->Current_stock;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$pacqty_dif= $packqty - $beforepacqty;
|
||||||
|
|
||||||
|
// if($pacqty_dif >0)
|
||||||
|
// {
|
||||||
|
// $paccurrentav_qty=$pacav_qty+$pacqty_dif;
|
||||||
|
// }
|
||||||
|
|
||||||
|
// else
|
||||||
|
// {
|
||||||
|
$paccurrentav_qty=$pacav_qty-$pacqty_dif;
|
||||||
|
//}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
// $paccurrentav_qty=$pacav_qty-$packqty;
|
||||||
|
|
||||||
|
|
||||||
|
$paccurrent_qty= array('Current_stock'=>$paccurrentav_qty);
|
||||||
|
|
||||||
|
$this->inwardgateregister_model->addmaterialmaster($paccurrent_qty,$packmaterial);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(count($checkpackid)>0)
|
if(count($checkpackid)>0)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -2285,7 +2285,39 @@ class cashbook extends BaseController
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function addNewSupplierCash()
|
||||||
|
{
|
||||||
|
$this->load->model('supplier_model');
|
||||||
|
$suppliername = $this->input->post('suppliername');
|
||||||
|
$contact = $this->input->post('contact');
|
||||||
|
$alternatecont = $this->input->post('alternatecont');
|
||||||
|
$email = $this->input->post('email');
|
||||||
|
$Address = $this->input->post('Address');
|
||||||
|
|
||||||
|
$suparray = array('suppliername'=>$suppliername,'Address'=>$Address,'ContactNumber'=>$contact,'AlternateContactNumber'=>$alternatecont,'EmailAddress'=>$email );
|
||||||
|
|
||||||
|
$result = $this->supplier_model->addNewsupplier($suparray);
|
||||||
|
if($result > 0)
|
||||||
|
{
|
||||||
|
|
||||||
|
echo "New Supplier Created successfully!";
|
||||||
|
redirect('addnewIncomeExpense','refresh');
|
||||||
|
}
|
||||||
|
|
||||||
|
else
|
||||||
|
{
|
||||||
|
|
||||||
|
echo "Supplier Record Not Created!";
|
||||||
|
redirect('addnewIncomeExpense','refresh');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public function getAllSupplier()
|
||||||
|
{
|
||||||
|
$suplist = $this->cashbook_model->getsupplier();
|
||||||
|
echo json_encode($suplist);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
@ -612,6 +612,23 @@ $RequestedBy = $this->input->post('drpDepartment');
|
|||||||
|
|
||||||
$MaterialstockHistoryadd= array('Ref_No'=>$IGRItemNo,'MaterialCode'=>$MaterialCode,'Transaction_type'=>'Add','Ref_Type'=>'IGR','SupplierID'=>$SupplierID,'Quantity'=>$QuantityAsPerInvoice,'ItemValue'=>$itemRate,'CreatedBy'=>$CreatedBy,'CreatedOn'=>$createddt);
|
$MaterialstockHistoryadd= array('Ref_No'=>$IGRItemNo,'MaterialCode'=>$MaterialCode,'Transaction_type'=>'Add','Ref_Type'=>'IGR','SupplierID'=>$SupplierID,'Quantity'=>$QuantityAsPerInvoice,'ItemValue'=>$itemRate,'CreatedBy'=>$CreatedBy,'CreatedOn'=>$createddt);
|
||||||
$this->inwardgateregister_model->addMaterialStockHistory($MaterialstockHistoryadd);
|
$this->inwardgateregister_model->addMaterialStockHistory($MaterialstockHistoryadd);
|
||||||
|
$get_pre_qty= $this->inwardgateregister_model->get_CurrentQty($MaterialCode);
|
||||||
|
$av_qty=0;
|
||||||
|
if(!empty($get_pre_qty))
|
||||||
|
{
|
||||||
|
foreach($get_pre_qty as $gt)
|
||||||
|
{
|
||||||
|
$av_qty=$gt->Current_stock;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$currentav_qty= $QuantityAsPerInvoice+$av_qty;
|
||||||
|
|
||||||
|
|
||||||
|
$current_qty= array('Current_stock'=>$currentav_qty);
|
||||||
|
|
||||||
|
$this->inwardgateregister_model->addmaterialmaster($current_qty,$MaterialCode);
|
||||||
|
|
||||||
|
|
||||||
$Recqty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONO,$MaterialCode);
|
$Recqty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONO,$MaterialCode);
|
||||||
$ReceivedQuantity = 0.00;
|
$ReceivedQuantity = 0.00;
|
||||||
|
|||||||
@ -470,22 +470,22 @@ $prefile =array();
|
|||||||
|
|
||||||
$this->inwardgateregister_model->addmaterialhistory($historydetails);
|
$this->inwardgateregister_model->addmaterialhistory($historydetails);
|
||||||
|
|
||||||
// $get_pre_qty= $this->inwardgateregister_model->get_CurrentQty($MaterialCode);
|
$get_pre_qty= $this->inwardgateregister_model->get_CurrentQty($MaterialCode);
|
||||||
// $av_qty=0;
|
$av_qty=0;
|
||||||
// if(!empty($get_pre_qty))
|
if(!empty($get_pre_qty))
|
||||||
// {
|
{
|
||||||
// foreach($get_pre_qty as $gt)
|
foreach($get_pre_qty as $gt)
|
||||||
// {
|
{
|
||||||
// $av_qty=$gt->Current_stock;
|
$av_qty=$gt->Current_stock;
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
|
|
||||||
// $currentav_qty= $QuantityAsPerInvoice+$av_qty;
|
$currentav_qty= $QuantityAsPerInvoice+$av_qty;
|
||||||
|
|
||||||
|
|
||||||
// $current_qty= array('Current_stock'=>$currentav_qty);
|
$current_qty= array('Current_stock'=>$currentav_qty);
|
||||||
|
|
||||||
// $this->inwardgateregister_model->addmaterialmaster($current_qty,$MaterialCode);
|
$this->inwardgateregister_model->addmaterialmaster($current_qty,$MaterialCode);
|
||||||
|
|
||||||
$Recqty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONO,$MaterialCode);
|
$Recqty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONO,$MaterialCode);
|
||||||
$ReceivedQuantity = 0.00;
|
$ReceivedQuantity = 0.00;
|
||||||
@ -830,6 +830,25 @@ $prefile =array();
|
|||||||
$this->inwardgateregister_model->addmaterialhistory($historydetails);
|
$this->inwardgateregister_model->addmaterialhistory($historydetails);
|
||||||
|
|
||||||
|
|
||||||
|
$get_pre_qty= $this->inwardgateregister_model->get_CurrentQty($MaterialCode);
|
||||||
|
$av_qty=0;
|
||||||
|
if(!empty($get_pre_qty))
|
||||||
|
{
|
||||||
|
foreach($get_pre_qty as $gt)
|
||||||
|
{
|
||||||
|
$av_qty=$gt->Current_stock;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$currentav_qty=$av_qty-$Outwardtotal;
|
||||||
|
|
||||||
|
|
||||||
|
$current_qty= array('Current_stock'=>$currentav_qty);
|
||||||
|
|
||||||
|
$this->inwardgateregister_model->addmaterialmaster($current_qty,$MaterialCode);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$this->inwardgateregister_model->UpdateOGRMasterOGRStatus($OGRNO);
|
$this->inwardgateregister_model->UpdateOGRMasterOGRStatus($OGRNO);
|
||||||
|
|
||||||
|
|||||||
@ -1310,6 +1310,32 @@ class purchaseorder extends BaseController
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
$rawget_pre_qty= $this->inwardgateregister_model->get_CurrentQty($MaterialCode);
|
||||||
|
$av_qty=0;
|
||||||
|
if(!empty($rawget_pre_qty))
|
||||||
|
{
|
||||||
|
foreach($rawget_pre_qty as $gt)
|
||||||
|
{
|
||||||
|
$av_qty=$gt->Current_stock;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// echo $av_qty;
|
||||||
|
// die();
|
||||||
|
$qty_dif= $Quantity - $b4qty;
|
||||||
|
|
||||||
|
$currentav_qty=$av_qty-$qty_dif;
|
||||||
|
|
||||||
|
|
||||||
|
//echo $currentav_qty;
|
||||||
|
//die();
|
||||||
|
|
||||||
|
$current_qty= array('Current_stock'=>$currentav_qty);
|
||||||
|
|
||||||
|
|
||||||
|
//echo $current_qty;
|
||||||
|
|
||||||
|
$this->inwardgateregister_model->addmaterialmaster($current_qty,$rawmaterial);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -53,7 +53,18 @@ class rawmaterialdetails extends BaseController
|
|||||||
$this->loadViews("rawmaterialListing", $this->global, $data, NULL);
|
$this->loadViews("rawmaterialListing", $this->global, $data, NULL);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
function shortagematerialListing()
|
||||||
|
{
|
||||||
|
|
||||||
|
$this->load->model('rawmaterialdetails_model');
|
||||||
|
|
||||||
|
|
||||||
|
$data['Records'] = $this->rawmaterialdetails_model->reOrderListing();
|
||||||
|
$this->global['pageTitle'] = $this->CompanyName.': ReOrderLevel Listing';
|
||||||
|
|
||||||
|
$this->loadViews("shortagematerialListing", $this->global, $data, NULL);
|
||||||
|
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* To load the add new material details
|
* To load the add new material details
|
||||||
*/
|
*/
|
||||||
@ -130,7 +141,7 @@ class rawmaterialdetails extends BaseController
|
|||||||
$TempArr = [];
|
$TempArr = [];
|
||||||
$this->form_validation->set_rules('MaterialName','Material Name','trim|required|');
|
$this->form_validation->set_rules('MaterialName','Material Name','trim|required|');
|
||||||
$this->form_validation->set_rules('MaterialType','MaterialType','trim|callback_MaterialType_validate');
|
$this->form_validation->set_rules('MaterialType','MaterialType','trim|callback_MaterialType_validate');
|
||||||
// $this->form_validation->set_rules('MaterialCategory','MaterialCategory','trim|callback_materialcategory_validate');
|
$this->form_validation->set_rules('MaterialCategory','MaterialCategory','trim|callback_materialcategory_validate');
|
||||||
$this->form_validation->set_rules('UOM','UOM','trim|callback_UOM_validate');
|
$this->form_validation->set_rules('UOM','UOM','trim|callback_UOM_validate');
|
||||||
|
|
||||||
if($this->form_validation->run() == FALSE)
|
if($this->form_validation->run() == FALSE)
|
||||||
@ -171,16 +182,57 @@ else
|
|||||||
$stock = $this->input->post('openstock');
|
$stock = $this->input->post('openstock');
|
||||||
$reorder = $this->input->post('reorder');
|
$reorder = $this->input->post('reorder');
|
||||||
$stockdate = $this->input->post('Date');
|
$stockdate = $this->input->post('Date');
|
||||||
|
|
||||||
|
$currentstock = '';
|
||||||
|
$today_dt = date('Y-m-d');
|
||||||
|
|
||||||
if (empty($stockdate))
|
if (empty($stockdate))
|
||||||
{
|
{
|
||||||
$stockdate = NULL;
|
//$stockdate = NULL;
|
||||||
|
$stockdate = date("Y-m-d");
|
||||||
|
$currentstock = $stock;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
$stockdate = strtotime( $stockdate);
|
$stockdate = strtotime( $stockdate);
|
||||||
$stockdate = date("Y-m-d ", $stockdate);
|
$stockdate = date("Y-m-d ", $stockdate);
|
||||||
|
// }
|
||||||
|
$todaydateyear = date('Y', strtotime($today_dt));
|
||||||
|
$todaydatemonth = date('m', strtotime($today_dt));
|
||||||
|
$todaydatedate = date('d', strtotime($today_dt));
|
||||||
|
|
||||||
|
$openstockdateyear = date('Y', strtotime($stockdate));
|
||||||
|
$parts = explode('-',$stockdate);
|
||||||
|
$openstockdatemonth = $parts[1];
|
||||||
|
$openstockdatedate = $parts[2];
|
||||||
|
|
||||||
|
if($openstockdateyear==$todaydateyear)
|
||||||
|
{
|
||||||
|
if($openstockdatemonth<=03)
|
||||||
|
{
|
||||||
|
$currentstock= 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$currentstock = $stock;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
else if($openstockdateyear<$todaydateyear)
|
||||||
|
{
|
||||||
|
//$total= $y;
|
||||||
|
$currentstock= 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
else if($openstockdateyear>$todaydateyear)
|
||||||
|
{
|
||||||
|
$currentstock = $stock;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
$CreatedBy = $this->session->userdata('userId');
|
$CreatedBy = $this->session->userdata('userId');
|
||||||
|
|
||||||
$chked = $this->input->post('isactive');
|
$chked = $this->input->post('isactive');
|
||||||
@ -227,7 +279,7 @@ else
|
|||||||
$IsActive = '0';
|
$IsActive = '0';
|
||||||
}
|
}
|
||||||
|
|
||||||
$RawMaterial = array('MaterialName'=>$MaterialName, 'MaterialType'=>$MaterialType, 'UOM'=>$UOM,'Category'=>$MaterialCategory, 'CreatedBy'=>$CreatedBy,'IsActive' => $IsActive,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'HSNCODE'=>$HSNcode ,'stock'=>$stock,'stockdate'=>$stockdate,'reorder'=>$reorder);
|
$RawMaterial = array('MaterialName'=>$MaterialName, 'MaterialType'=>$MaterialType, 'UOM'=>$UOM,'Category'=>$MaterialCategory, 'CreatedBy'=>$CreatedBy,'IsActive' => $IsActive,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'HSNCODE'=>$HSNcode ,'stock'=>$stock,'stockdate'=>$stockdate,'reorder'=>$reorder,'Current_stock'=>$currentstock);
|
||||||
$result = $this->rawmaterialdetails_model->addNewRawMaterial($RawMaterial);
|
$result = $this->rawmaterialdetails_model->addNewRawMaterial($RawMaterial);
|
||||||
|
|
||||||
if($result > 0)
|
if($result > 0)
|
||||||
@ -391,7 +443,7 @@ else
|
|||||||
}
|
}
|
||||||
|
|
||||||
$RawMaterial = array();
|
$RawMaterial = array();
|
||||||
$RawMaterial = array('MaterialName'=>$MaterialName,'MaterialType'=>$MaterialType,'UpdatedBy'=>$UpdatedBy, 'UOM'=>$UOM,'IsActive' => $IsActive,'Category'=>$MaterialCategory,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'HSNCODE'=>$HSNcode);
|
//$RawMaterial = array('MaterialName'=>$MaterialName,'MaterialType'=>$MaterialType,'UpdatedBy'=>$UpdatedBy, 'UOM'=>$UOM,'IsActive' => $IsActive,'Category'=>$MaterialCategory,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'HSNCODE'=>$HSNcode);
|
||||||
$RawMaterial = array('MaterialName'=>$MaterialName,'MaterialType'=>$MaterialType,'UpdatedBy'=>$UpdatedBy, 'UOM'=>$UOM,'IsActive' => $IsActive,'Category'=>$MaterialCategory,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'HSNCODE'=>$HSNcode,'stock'=>$stock,'stockdate'=>$stockdate,'reorder'=>$reorder);//,'RMCode'=>$rmcode);
|
$RawMaterial = array('MaterialName'=>$MaterialName,'MaterialType'=>$MaterialType,'UpdatedBy'=>$UpdatedBy, 'UOM'=>$UOM,'IsActive' => $IsActive,'Category'=>$MaterialCategory,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'HSNCODE'=>$HSNcode,'stock'=>$stock,'stockdate'=>$stockdate,'reorder'=>$reorder);//,'RMCode'=>$rmcode);
|
||||||
$result = $this->rawmaterialdetails_model->editRawmaterial($RawMaterial, $MaterialCode);
|
$result = $this->rawmaterialdetails_model->editRawmaterial($RawMaterial, $MaterialCode);
|
||||||
|
|
||||||
@ -434,20 +486,7 @@ function insertvalueintoconfig(){
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* To Check and display the already existing material list
|
|
||||||
*/
|
|
||||||
function checkmaterial()
|
|
||||||
{
|
|
||||||
$material = $this->input->post('id');
|
|
||||||
$this->load->model('rawmaterialdetails_model');
|
|
||||||
$query = $this->rawmaterialdetails_model->checkMaterialExists($material);
|
|
||||||
echo json_encode($query);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* To export report of material details in excel
|
|
||||||
*/
|
|
||||||
function export_material(){
|
function export_material(){
|
||||||
|
|
||||||
|
|
||||||
@ -562,6 +601,21 @@ function insertvalueintoconfig(){
|
|||||||
|
|
||||||
$this->loadViews("404", $this->global, NULL, NULL);
|
$this->loadViews("404", $this->global, NULL, NULL);
|
||||||
}
|
}
|
||||||
|
/**
|
||||||
|
* To Check and display the already existing material list
|
||||||
|
*/
|
||||||
|
function checkmaterial()
|
||||||
|
{
|
||||||
|
$material = $this->input->post('id');
|
||||||
|
$this->load->model('rawmaterialdetails_model');
|
||||||
|
$query = $this->rawmaterialdetails_model->checkMaterialExists($material);
|
||||||
|
//print_r($query);
|
||||||
|
echo json_encode($query);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* To export report of material details in excel
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
@ -60,4 +60,19 @@ function get_fav($user)
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function reOrderListing()
|
||||||
|
{
|
||||||
|
$CI = &get_instance();
|
||||||
|
$CI->load->database();
|
||||||
|
|
||||||
|
$CI->db->reconnect();
|
||||||
|
$subQuery='SELECT * from T_MaterialMaster where Current_stock < reorder?';
|
||||||
|
|
||||||
|
$query=$CI->db->query($subQuery,array());
|
||||||
|
//print_r($this->db->last_query());
|
||||||
|
|
||||||
|
return $query->result();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
?>
|
?>
|
||||||
@ -269,7 +269,24 @@ class inwardgateregister_model extends CI_Model
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function addmaterialmaster($current_qty,$MaterialCode)
|
||||||
|
{
|
||||||
|
$this->db->where('MaterialCode',$MaterialCode);
|
||||||
|
$this->db->update('T_MaterialMaster',$current_qty);
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function get_CurrentQty($MaterialCode)
|
||||||
|
{
|
||||||
|
$this->db->select('Current_stock');
|
||||||
|
$this->db->from('T_MaterialMaster');
|
||||||
|
$this->db->where('T_MaterialMaster.MaterialCode',$MaterialCode);
|
||||||
|
$query = $this->db->get();
|
||||||
|
// print_r( $this->db->last_query());
|
||||||
|
$result = $query->result();
|
||||||
|
return $result;
|
||||||
|
}
|
||||||
function getitemvalue($pono,$MaterialCode)
|
function getitemvalue($pono,$MaterialCode)
|
||||||
{
|
{
|
||||||
$this->db->select('Rate,SupplierID');
|
$this->db->select('Rate,SupplierID');
|
||||||
|
|||||||
@ -246,5 +246,15 @@ class rawmaterialdetails_model extends CI_Model
|
|||||||
$temp['suggestions'] = $temparr;
|
$temp['suggestions'] = $temparr;
|
||||||
return $temp;
|
return $temp;
|
||||||
}
|
}
|
||||||
|
function reOrderListing()
|
||||||
|
{
|
||||||
|
|
||||||
|
$subQuery='SELECT * from T_MaterialMaster where Current_stock < reorder?';
|
||||||
|
|
||||||
|
$query=$this->db->query($subQuery,array());
|
||||||
|
//print_r($this->db->last_query());
|
||||||
|
|
||||||
|
return $query->result();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
@ -2052,7 +2052,7 @@ var stock_date_date = '';
|
|||||||
stock_date_date = split[2];
|
stock_date_date = split[2];
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
})
|
||||||
|
|
||||||
if(((materialcode != 0)&&(supplier != 0)))
|
if(((materialcode != 0)&&(supplier != 0)))
|
||||||
{
|
{
|
||||||
@ -2198,7 +2198,7 @@ var stock_date_date = '';
|
|||||||
stock_date_date = split[2];
|
stock_date_date = split[2];
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
})
|
||||||
|
|
||||||
if(((materialcode != 0)&&(supplier != 0)))
|
if(((materialcode != 0)&&(supplier != 0)))
|
||||||
{
|
{
|
||||||
|
|||||||
@ -227,7 +227,7 @@ $(function() {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
</div>
|
||||||
</div><!-- /.box-body -->
|
</div><!-- /.box-body -->
|
||||||
|
|
||||||
<div class="box-footer" style="text-align:right">
|
<div class="box-footer" style="text-align:right">
|
||||||
@ -238,6 +238,35 @@ $(function() {
|
|||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-md-4">
|
||||||
|
<?php
|
||||||
|
$this->load->helper('form');
|
||||||
|
$error = $this->session->flashdata('error');
|
||||||
|
if($error)
|
||||||
|
{
|
||||||
|
?>
|
||||||
|
<div class="alert alert-danger alert-dismissable">
|
||||||
|
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
|
||||||
|
<?php echo $this->session->flashdata('error'); ?>
|
||||||
|
</div>
|
||||||
|
<?php } ?>
|
||||||
|
<?php
|
||||||
|
$success = $this->session->flashdata('success');
|
||||||
|
if($success)
|
||||||
|
{
|
||||||
|
?>
|
||||||
|
<div class="alert alert-success alert-dismissable">
|
||||||
|
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button>
|
||||||
|
<?php echo $this->session->flashdata('success'); ?>
|
||||||
|
</div>
|
||||||
|
<?php } ?>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-12">
|
||||||
|
<?php echo validation_errors('<div class="alert alert-danger alert-dismissable">', ' <button type="button" class="close" data-dismiss="alert" aria-hidden="true">×</button></div>'); ?>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
@ -417,4 +446,32 @@ $('#content').loader('show');
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
|
function Validate()
|
||||||
|
{
|
||||||
|
if($("#MaterialName").val().length < 1)
|
||||||
|
{
|
||||||
|
alert('Please Enter MaterialName');
|
||||||
|
$("#MaterialName").focus();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if($("option:selected", $("#UOM")).val() == "")
|
||||||
|
{
|
||||||
|
alert('Please Select UOM ');
|
||||||
|
$("#UOM").focus();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if($("option:selected", $("#MaterialCategory")).val() == "")
|
||||||
|
{
|
||||||
|
alert('Please Select Material Category');
|
||||||
|
$("#MaterialCategory").focus();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if($("option:selected", $("#MaterialType")).val() == "")
|
||||||
|
{
|
||||||
|
alert('Please Select Material Type');
|
||||||
|
$("#MaterialType").focus();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
</script>
|
</script>
|
||||||
@ -8,7 +8,10 @@
|
|||||||
background-color:#A1887F;
|
background-color:#A1887F;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
.modalfooter
|
||||||
|
{
|
||||||
|
background-color:white; !important
|
||||||
|
}
|
||||||
/* Style the buttons inside the tab */
|
/* Style the buttons inside the tab */
|
||||||
.tab button {
|
.tab button {
|
||||||
background-color: inherit;
|
background-color: inherit;
|
||||||
@ -43,6 +46,29 @@
|
|||||||
background-color:skyblue;
|
background-color:skyblue;
|
||||||
/* background-color: darkgrey; */
|
/* background-color: darkgrey; */
|
||||||
outline: 1px solid slategrey;
|
outline: 1px solid slategrey;
|
||||||
|
}
|
||||||
|
.modal
|
||||||
|
{
|
||||||
|
padding-right:25% ! important;
|
||||||
|
}
|
||||||
|
.dataTables_paginate
|
||||||
|
{
|
||||||
|
margin-top: -5%;
|
||||||
|
}
|
||||||
|
.dataTables_wrapper {
|
||||||
|
padding-bottom: 0px;
|
||||||
|
}
|
||||||
|
.badge
|
||||||
|
{
|
||||||
|
color:red; background-color:#fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
legend{
|
||||||
|
color:#00c0ef ! important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.content {
|
||||||
|
Padding:0% ! important;
|
||||||
}
|
}
|
||||||
</style>
|
</style>
|
||||||
<div class="content-wrapper" style="min-height: 537px;">
|
<div class="content-wrapper" style="min-height: 537px;">
|
||||||
@ -101,15 +127,24 @@
|
|||||||
<input type="text" class="form-control required" id="towhome" name="towhome">
|
<input type="text" class="form-control required" id="towhome" name="towhome">
|
||||||
</div></div>
|
</div></div>
|
||||||
|
|
||||||
<div class="col-md-3"><div class="form-group">
|
<div class="col-md-3">
|
||||||
|
<div class="form-group">
|
||||||
<b><span for="Suppliername">Select Supplier:</span> </b><span style="color:red">*</span></br></br>
|
<b><span for="Suppliername">Select Supplier:</span> </b><span style="color:red">*</span></br></br>
|
||||||
<select class="form-control select2 required" id="supplier" name="supplier">
|
<select class="form-control select2 required" id="supplier" name="supplier">
|
||||||
<option value="-1">Select Supplier</option>
|
<option value="-1">Select Supplier</option>
|
||||||
</select>
|
</select>
|
||||||
</div></div>
|
</div></div>
|
||||||
|
<a data-target='#Addsup' data-toggle="modal" href="#Addsup">Add New Supplier</a>
|
||||||
</div><!--/ col-md -12-->
|
</div><!--/ col-md -12-->
|
||||||
|
|
||||||
|
|
||||||
</div><!-- /row -->
|
</div><!-- /row -->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div class="col-md-3">
|
<div class="col-md-3">
|
||||||
@ -258,7 +293,7 @@
|
|||||||
<option value="-1">Select Supplier</option>
|
<option value="-1">Select Supplier</option>
|
||||||
</select>
|
</select>
|
||||||
</div></div>
|
</div></div>
|
||||||
|
<a data-target='#Addsup' data-toggle="modal" href="#Addsup">Add New Supplier</a>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@ -381,6 +416,70 @@
|
|||||||
</div><!-- row div-->
|
</div><!-- row div-->
|
||||||
</div><!-- tabcontent-->
|
</div><!-- tabcontent-->
|
||||||
</section><!-- content section -->
|
</section><!-- content section -->
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<div align="right">
|
||||||
|
|
||||||
|
<div id="Addsup" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
||||||
|
<div class="modal-dialog">
|
||||||
|
<form>
|
||||||
|
<div class="modal-content" style="width:1030px;font-size:12px;">
|
||||||
|
<div class="modal-header" style="background-color: #5d0411;color:#fff;">
|
||||||
|
<center><h4> New Supplier Details</h4></center>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-10 col-md-offset-1"><br/>
|
||||||
|
<div class="box-body">
|
||||||
|
<div align="left">
|
||||||
|
<legend>Supplier Information</legend>
|
||||||
|
<div class="col-md-12">
|
||||||
|
<div class="col-md-3">
|
||||||
|
<span for="SupplierName">Supplier Name</span><span class="badge">*</span>
|
||||||
|
<input type="text" name="SupplierName" onkeypress="return onlyAlphabets(event);" maxlength="100" id="supplierName" class="form-control" required>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="col-md-3">
|
||||||
|
<span for="ContactNumber">Contact Number</span><span class="badge">*</span>
|
||||||
|
<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)">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="col-md-3">
|
||||||
|
<span for="AlternateContactNumber">Alternate Contact Number</span>
|
||||||
|
<input type="text" name="AlternateContactNumber" 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">
|
||||||
|
<span for="EmailAddress">Email ID</span><span class="badge">*</span>
|
||||||
|
<input type="email" name="emailid" id="emailid" required maxlength="100" class="form-control">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<legend>Address Details</legend>
|
||||||
|
<!-- Text input-->
|
||||||
|
<div class="col-md-12" >
|
||||||
|
<div class="col-md-12"><span for="Address2">Address</span><span class="badge">*</span>
|
||||||
|
<input type="text" class="form-control required" id="Address" name="Address" maxlength="500" required>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="box-footer modalfooter" style="text-align:right" >
|
||||||
|
<a class="btn btn-primary font AddSupplier" ID="AddSupplier" > <span class="bold">Save</span></a>
|
||||||
|
<a class="btn btn-primary" data-dismiss="modal" value="Cancel">Cancel</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
</div><!-- content-wrapper div-->
|
</div><!-- content-wrapper div-->
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
@ -1091,4 +1190,212 @@ function valid(){
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$('#supplier').change(function() {
|
||||||
|
|
||||||
|
var drpval = $('#supplier').val();
|
||||||
|
if(drpval == 1)
|
||||||
|
{
|
||||||
|
//alert()
|
||||||
|
$('#Addsup').modal('show');
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
function onlyAlphabets(evt)
|
||||||
|
{
|
||||||
|
var charCode;
|
||||||
|
if (window.event)
|
||||||
|
charCode = window.event.keyCode; //for IE
|
||||||
|
else
|
||||||
|
charCode = evt.which; //for firefox
|
||||||
|
if (charCode == 32) //for <space> symbol
|
||||||
|
return true;
|
||||||
|
if (charCode > 31 && charCode < 65) //for characters before 'A' in ASCII Table
|
||||||
|
return false;
|
||||||
|
if (charCode > 90 && charCode < 97) //for characters between 'Z' and 'a' in ASCII Table
|
||||||
|
return false;
|
||||||
|
if (charCode > 122) //for characters beyond 'z' in ASCII Table
|
||||||
|
return false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getContactNumberValidation()
|
||||||
|
{
|
||||||
|
|
||||||
|
var contactNumber = $('#ContactNumber').val();
|
||||||
|
var telephone =/^[0-9]{3,4}\s[0-9]{8,9}$/.test(contactNumber);
|
||||||
|
var regex = /^[0-9]{4,6}\s[0-9]{5,7}$/.test(contactNumber);
|
||||||
|
var mobilephone = /^[0-9]{10,12}$/.test(contactNumber);
|
||||||
|
|
||||||
|
if(contactNumber!='')
|
||||||
|
{
|
||||||
|
|
||||||
|
if(telephone)
|
||||||
|
{
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
else if(regex)
|
||||||
|
{
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else if(mobilephone)
|
||||||
|
{
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
else
|
||||||
|
{
|
||||||
|
alert('Please Enter valid Contact Number ex: 044 12345678 , 0444 1234567,04444 123456 and 9876543210');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
|
||||||
|
alert('please correct format of contact number');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
function isNumberKey(evt)
|
||||||
|
{
|
||||||
|
var charCode = (evt.which) ? evt.which : evt.keyCode;
|
||||||
|
if (charCode != 46 && charCode != 32 && charCode >= 33
|
||||||
|
&& (charCode < 48 || charCode > 57))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function validateEmail() {
|
||||||
|
var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
|
||||||
|
|
||||||
|
var email = $('#emailid').val();
|
||||||
|
|
||||||
|
if(email != '')
|
||||||
|
{
|
||||||
|
if (reg.test(email) == false)
|
||||||
|
{
|
||||||
|
alert('Please Enter Valid Email Address');
|
||||||
|
return (false);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
alert('Please Enter email id');
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function validatesup()
|
||||||
|
{
|
||||||
|
// var a= $('#supplierName').val();
|
||||||
|
// alert(a);
|
||||||
|
|
||||||
|
if($("#supplierName").val().length < 1)
|
||||||
|
{
|
||||||
|
alert('Please Enter Supplier Name');
|
||||||
|
$("#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');
|
||||||
|
$("#Address").focus();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$('.AddSupplier').click(function()
|
||||||
|
{
|
||||||
|
if(validatesup())
|
||||||
|
{
|
||||||
|
var suppliername = $('#supplierName').val();
|
||||||
|
var contact = $('#ContactNumber').val();
|
||||||
|
var alternatecont = $('#AlternateContactNumber').val();
|
||||||
|
var email = $('#emailid').val();
|
||||||
|
var Address = $('#Address').val();
|
||||||
|
$('#content').loader('show');
|
||||||
|
$.ajax({
|
||||||
|
|
||||||
|
data:{suppliername:suppliername,contact:contact,alternatecont:alternatecont,email:email,Address:Address},
|
||||||
|
type:"POST",
|
||||||
|
url:"<?php echo base_url() ?>cashbook/addNewSupplierCash",
|
||||||
|
|
||||||
|
success:function(data)
|
||||||
|
{
|
||||||
|
// $('#content').loader('hide');
|
||||||
|
// alert(data);
|
||||||
|
var alertdata=data;
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
|
||||||
|
type:"POST",
|
||||||
|
url:"<?php echo base_url() ?>cashbook/getAllSupplier",
|
||||||
|
success:function(data)
|
||||||
|
{
|
||||||
|
var html = '';
|
||||||
|
$('#supplier').find('option:not(:first)').remove();
|
||||||
|
|
||||||
|
$.each(JSON.parse(data), function (supDet, supobj)
|
||||||
|
{
|
||||||
|
|
||||||
|
// html +="<option value="+supobj.SupplierID+">"+supobj.SupplierName+"</option>";
|
||||||
|
|
||||||
|
$("#supplier").append( $('<option></option>').val(supobj.SupplierID).html(supobj.SupplierID+' - '+supobj.SupplierName));
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
//$("#supplier").append(html);
|
||||||
|
alert(alertdata);
|
||||||
|
$('#content').loader('hide');
|
||||||
|
$('#Addsup').modal('hide');
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
</script>
|
</script>
|
||||||
@ -286,10 +286,35 @@ $('#Paymentmerchant').autocomplete({
|
|||||||
/* background-color: darkgrey; */
|
/* background-color: darkgrey; */
|
||||||
outline: 1px solid slategrey;
|
outline: 1px solid slategrey;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.modal
|
||||||
|
{
|
||||||
|
padding-right:25% ! important;
|
||||||
|
}
|
||||||
|
.dataTables_paginate
|
||||||
|
{
|
||||||
|
margin-top: -5%;
|
||||||
|
}
|
||||||
|
.dataTables_wrapper {
|
||||||
|
padding-bottom: 0px;
|
||||||
|
}
|
||||||
|
.badge
|
||||||
|
{
|
||||||
|
color:red; background-color:#fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
legend{
|
||||||
|
color:#00c0ef ! important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.content {
|
||||||
|
Padding:0% ! important;
|
||||||
|
}
|
||||||
</style>
|
</style>
|
||||||
<div class="content-wrapper" style="min-height: 537px;">
|
<div class="content-wrapper" style="min-height: 537px;">
|
||||||
<!-- Content Header (Page header) -->
|
<!-- Content Header (Page header) -->
|
||||||
<section class="content">
|
<section class="content">
|
||||||
|
<div id="content"></div>
|
||||||
<div style="text-align:right;">
|
<div style="text-align:right;">
|
||||||
<a href="<?php base_url() ?>Bankingstatement" class="btn btn-primary" value="Back"/>Back</a>
|
<a href="<?php base_url() ?>Bankingstatement" class="btn btn-primary" value="Back"/>Back</a>
|
||||||
</div>
|
</div>
|
||||||
@ -360,6 +385,7 @@ $('#Paymentmerchant').autocomplete({
|
|||||||
<b><span for="Accountname">Account Name Select:</span> </b><span style="color:red">*</span></br></br>
|
<b><span for="Accountname">Account Name Select:</span> </b><span style="color:red">*</span></br></br>
|
||||||
<select class="form-control required " required id="Recepitaccode" required name="accode">
|
<select class="form-control required " required id="Recepitaccode" required name="accode">
|
||||||
<option value="-1">Account Name Select</option>
|
<option value="-1">Account Name Select</option>
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
</div></div>
|
</div></div>
|
||||||
<div class="col-md-3"><div class="form-group">
|
<div class="col-md-3"><div class="form-group">
|
||||||
@ -375,8 +401,100 @@ $('#Paymentmerchant').autocomplete({
|
|||||||
<b><span for="Suppliername">Select Supplier:</span> </b><span style="color:red">*</span></br></br>
|
<b><span for="Suppliername">Select Supplier:</span> </b><span style="color:red">*</span></br></br>
|
||||||
<select class="form-control select2 required" id="supplier" name="supplier">
|
<select class="form-control select2 required" id="supplier" name="supplier">
|
||||||
<option value="-1">Select Supplier</option>
|
<option value="-1">Select Supplier</option>
|
||||||
|
<option value="1">Create New Supplier</option>
|
||||||
</select>
|
</select>
|
||||||
</div></div>
|
</div></div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<a data-target='#Addsup' data-toggle="modal" href="#Addsup">Add New Supplier</a>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<div align="right">
|
||||||
|
<a data-toggle="modal" class="btn btn-primary" data-dismiss="modal">Add Line Item </a>
|
||||||
|
<div id="Addsup" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
||||||
|
<div class="modal-dialog">
|
||||||
|
<form>
|
||||||
|
<div class="modal-content" style="width:1030px;font-size:12px;">
|
||||||
|
<div class="modal-header" style="background-color: #3c8dbc;color:#fff;">
|
||||||
|
<center><h4>Siddharth Industries - New Supplier Details</h4></center>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-10 col-md-offset-1"><br/>
|
||||||
|
<div class="box-body">
|
||||||
|
<div align="left">
|
||||||
|
<legend>Supplier Information</legend>
|
||||||
|
<div class="col-md-12">
|
||||||
|
<div class="col-md-3">
|
||||||
|
<span for="SupplierName">Supplier Name</span><span class="badge">*</span>
|
||||||
|
<input type="text" name="SupplierName" onkeypress="return onlyAlphabets(event);" maxlength="100" id="supplierName" class="form-control" required>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="col-md-3">
|
||||||
|
<span for="ContactNumber">Contact Number</span><span class="badge">*</span>
|
||||||
|
<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)">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="col-md-3">
|
||||||
|
<span for="AlternateContactNumber">Alternate Contact Number</span>
|
||||||
|
<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">
|
||||||
|
<span for="EmailAddress">Email ID</span><span class="badge">*</span>
|
||||||
|
<input type="email" name="emailid" id="emailid" required maxlength="100" class="form-control">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<legend>Address Details</legend>
|
||||||
|
<!-- Text input-->
|
||||||
|
<div class="col-md-12" >
|
||||||
|
<div class="col-md-12"><span for="Address2">Address</span><span class="badge">*</span>
|
||||||
|
<input type="text" class="form-control required" id="Address" name="Address" maxlength="500" required>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="box-footer" style="text-align:right">
|
||||||
|
<a class="btn btn-primary font AddSupplier" ID="AddSupplier" > <span class="bold">Save</span></a>
|
||||||
|
<a class="btn btn-primary" data-dismiss="modal" value="Cancel">Cancel</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<div class="col-md-3">
|
||||||
|
<div class="form-group">
|
||||||
|
<b><span for="Total">Total Amount:</span></b><span style="color:red">*</span></br></br>
|
||||||
|
|
||||||
|
<input type="text" class="form-control" id="totalamount" name="totalamount" onkeypress="return isNumberKey(event)" style="text-align:right;">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="col-md-6">
|
||||||
|
<b><span for="Description">Description:</span></b></br></br>
|
||||||
|
|
||||||
|
<textarea class="form-control" id="description" name="description" >
|
||||||
|
</textarea>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div><!--/ col-md -12-->
|
</div><!--/ col-md -12-->
|
||||||
</div><!-- /row -->
|
</div><!-- /row -->
|
||||||
@ -541,6 +659,7 @@ $('#Paymentmerchant').autocomplete({
|
|||||||
<b><span for="Suppliername">Select Supplier:</span> </b><span style="color:red">*</span></br></br>
|
<b><span for="Suppliername">Select Supplier:</span> </b><span style="color:red">*</span></br></br>
|
||||||
<select class="form-control select2 required" id="Paymentsupplier" name="Paymentsupplier">
|
<select class="form-control select2 required" id="Paymentsupplier" name="Paymentsupplier">
|
||||||
<option value="-1">Select Supplier</option>
|
<option value="-1">Select Supplier</option>
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
</div></div>
|
</div></div>
|
||||||
|
|
||||||
@ -1174,6 +1293,216 @@ $('#addPayment').submit();
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$('#supplier').change(function() {
|
||||||
|
|
||||||
|
var drpval = $('#supplier').val();
|
||||||
|
if(drpval == 1)
|
||||||
|
{
|
||||||
|
//alert()
|
||||||
|
$('#Addsup').modal('show');
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
function onlyAlphabets(evt)
|
||||||
|
{
|
||||||
|
var charCode;
|
||||||
|
if (window.event)
|
||||||
|
charCode = window.event.keyCode; //for IE
|
||||||
|
else
|
||||||
|
charCode = evt.which; //for firefox
|
||||||
|
if (charCode == 32) //for <space> symbol
|
||||||
|
return true;
|
||||||
|
if (charCode > 31 && charCode < 65) //for characters before 'A' in ASCII Table
|
||||||
|
return false;
|
||||||
|
if (charCode > 90 && charCode < 97) //for characters between 'Z' and 'a' in ASCII Table
|
||||||
|
return false;
|
||||||
|
if (charCode > 122) //for characters beyond 'z' in ASCII Table
|
||||||
|
return false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getContactNumberValidation()
|
||||||
|
{
|
||||||
|
|
||||||
|
var contactNumber = $('#ContactNumber').val();
|
||||||
|
var telephone =/^[0-9]{3,4}\s[0-9]{8,9}$/.test(contactNumber);
|
||||||
|
var regex = /^[0-9]{4,6}\s[0-9]{5,7}$/.test(contactNumber);
|
||||||
|
var mobilephone = /^[0-9]{10,12}$/.test(contactNumber);
|
||||||
|
|
||||||
|
if(contactNumber!='')
|
||||||
|
{
|
||||||
|
|
||||||
|
if(telephone)
|
||||||
|
{
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
else if(regex)
|
||||||
|
{
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else if(mobilephone)
|
||||||
|
{
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
else
|
||||||
|
{
|
||||||
|
alert('Please Enter valid Contact Number ex: 044 12345678 , 0444 1234567,04444 123456 and 9876543210');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
|
||||||
|
alert('please correct format of contact number');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
function isNumberKey(evt)
|
||||||
|
{
|
||||||
|
var charCode = (evt.which) ? evt.which : evt.keyCode;
|
||||||
|
if (charCode != 46 && charCode != 32 && charCode >= 33
|
||||||
|
&& (charCode < 48 || charCode > 57))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function validateEmail() {
|
||||||
|
var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
|
||||||
|
|
||||||
|
var email = $('#emailid').val();
|
||||||
|
|
||||||
|
if(email != '')
|
||||||
|
{
|
||||||
|
if (reg.test(email) == false)
|
||||||
|
{
|
||||||
|
alert('Please Enter Valid Email Address');
|
||||||
|
return (false);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
alert('Please Enter email id');
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function validatesup()
|
||||||
|
{
|
||||||
|
// var a= $('#supplierName').val();
|
||||||
|
// alert(a);
|
||||||
|
|
||||||
|
if($("#supplierName").val().length < 1)
|
||||||
|
{
|
||||||
|
alert('Please Enter Supplier Name');
|
||||||
|
$("#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');
|
||||||
|
$("#Address").focus();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
$('.AddSupplier').click(function()
|
||||||
|
{
|
||||||
|
if(validatesup())
|
||||||
|
{
|
||||||
|
var suppliername = $('#supplierName').val();
|
||||||
|
var contact = $('#ContactNumber').val();
|
||||||
|
var alternatecont = $('#AlternateContactNumber').val();
|
||||||
|
var email = $('#emailid').val();
|
||||||
|
var Address = $('#Address').val();
|
||||||
|
$('#content').loader('show');
|
||||||
|
$.ajax({
|
||||||
|
|
||||||
|
data:{suppliername:suppliername,contact:contact,alternatecont:alternatecont,email:email,Address:Address},
|
||||||
|
type:"POST",
|
||||||
|
url:"<?php echo base_url() ?>cashbook/addNewSupplierCash",
|
||||||
|
|
||||||
|
success:function(data)
|
||||||
|
{
|
||||||
|
// $('#content').loader('hide');
|
||||||
|
// alert(data);
|
||||||
|
// location.reload();
|
||||||
|
|
||||||
|
|
||||||
|
var alertdata=data;
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
|
||||||
|
type:"POST",
|
||||||
|
url:"<?php echo base_url() ?>cashbook/getAllSupplier",
|
||||||
|
success:function(data)
|
||||||
|
{
|
||||||
|
var html = '';
|
||||||
|
$('#supplier').find('option:not(:first)').remove();
|
||||||
|
|
||||||
|
$.each(JSON.parse(data), function (supDet, supobj)
|
||||||
|
{
|
||||||
|
|
||||||
|
// html +="<option value="+supobj.SupplierID+">"+supobj.SupplierName+"</option>";
|
||||||
|
|
||||||
|
$("#supplier").append( $('<option></option>').val(supobj.SupplierID).html(supobj.SupplierID+' - '+supobj.SupplierName));
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
//$("#supplier").append(html);
|
||||||
|
alert(alertdata);
|
||||||
|
// $('#supplier option[value="<?php echo $supplier?>"]').prop('selected', true);
|
||||||
|
$('#content').loader('hide');
|
||||||
|
$('#Addsup').modal('hide');
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -434,6 +434,8 @@ $(function() {
|
|||||||
|
|
||||||
|
|
||||||
<input type="hidden" name="<?php echo 'rawQty'.$index ?>" id="<?php echo 'rawQty'.$index ?>" value="<?php echo $raw->Quantity ; ?>" readonly/>
|
<input type="hidden" name="<?php echo 'rawQty'.$index ?>" id="<?php echo 'rawQty'.$index ?>" value="<?php echo $raw->Quantity ; ?>" readonly/>
|
||||||
|
<input type="hidden" name="<?php echo 'beforerawQty'.$index ?>" id="<?php echo 'beforerawQty'.$index ?>" value="<?php echo $raw->Quantity ; ?>" readonly/>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<input type="hidden" name="<?php echo 'rawprice'.$index ?>" id="<?php echo 'rawprice'.$index ?>" value="<?php echo $raw->Price ; ?>" readonly/>
|
<input type="hidden" name="<?php echo 'rawprice'.$index ?>" id="<?php echo 'rawprice'.$index ?>" value="<?php echo $raw->Price ; ?>" readonly/>
|
||||||
@ -698,6 +700,8 @@ $(function() {
|
|||||||
|
|
||||||
<input type="hidden" name="<?php echo 'consumeQty'.$inde ?>" id="<?php echo 'consumeQty'.$inde ?>" value="<?php echo $cou->Quantity ; ?>" />
|
<input type="hidden" name="<?php echo 'consumeQty'.$inde ?>" id="<?php echo 'consumeQty'.$inde ?>" value="<?php echo $cou->Quantity ; ?>" />
|
||||||
|
|
||||||
|
|
||||||
|
<input type="hidden" name="<?php echo 'beforeconsumeQty'.$inde ?>" id="<?php echo 'beforeconsumeQty'.$inde ?>" value="<?php echo $cou->Quantity ; ?>" />
|
||||||
<input type="hidden" name="<?php echo 'consumeprice'.$inde ?>" id="<?php echo 'consumeprice'.$inde ?>" value="<?php echo $cou->Price ; ?>" />
|
<input type="hidden" name="<?php echo 'consumeprice'.$inde ?>" id="<?php echo 'consumeprice'.$inde ?>" value="<?php echo $cou->Price ; ?>" />
|
||||||
|
|
||||||
<?php }}?>
|
<?php }}?>
|
||||||
@ -950,7 +954,7 @@ $(function() {
|
|||||||
<input type="hidden" name="<?php echo 'packSupplierID'.$intt ?>" id="<?php echo 'packSupplierID'.$intt ?>" value="<?php echo $pac->SupplierID ; ?>" />
|
<input type="hidden" name="<?php echo 'packSupplierID'.$intt ?>" id="<?php echo 'packSupplierID'.$intt ?>" value="<?php echo $pac->SupplierID ; ?>" />
|
||||||
|
|
||||||
<input type="hidden" name="<?php echo 'packQty'.$intt ?>" id="<?php echo 'packQty'.$intt ?>" value="<?php echo $pac->Quantity ; ?>" />
|
<input type="hidden" name="<?php echo 'packQty'.$intt ?>" id="<?php echo 'packQty'.$intt ?>" value="<?php echo $pac->Quantity ; ?>" />
|
||||||
|
<input type="hidden" name="<?php echo 'beforepackQty'.$intt ?>" id="<?php echo 'beforepackQty'.$intt ?>" value="<?php echo $pac->Quantity ; ?>" />
|
||||||
<input type="hidden" name="<?php echo 'packprice'.$intt ?>" id="<?php echo 'packprice'.$intt ?>" value="<?php echo $pac->Price ; ?>" />
|
<input type="hidden" name="<?php echo 'packprice'.$intt ?>" id="<?php echo 'packprice'.$intt ?>" value="<?php echo $pac->Price ; ?>" />
|
||||||
|
|
||||||
<?php }}?>
|
<?php }}?>
|
||||||
@ -1914,7 +1918,7 @@ function ResultantQty(materialtype)
|
|||||||
//console.log(openqty);
|
//console.log(openqty);
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
})
|
||||||
// alert("add"+materialcode);
|
// alert("add"+materialcode);
|
||||||
// alert("add"+supplier);
|
// alert("add"+supplier);
|
||||||
|
|
||||||
@ -2071,7 +2075,7 @@ var stock_date = '';
|
|||||||
stock_date_date = split[2];
|
stock_date_date = split[2];
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
})
|
||||||
if(((materialcode != 0)&&(supplier != 0)))
|
if(((materialcode != 0)&&(supplier != 0)))
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -2134,7 +2138,7 @@ var stock_date = '';
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
|
// var resultantqty = parseFloat(addqty)- parseFloat(reduceqty);
|
||||||
if(stock_date_year==today_year)
|
if(stock_date_year==today_year)
|
||||||
{
|
{
|
||||||
|
|
||||||
@ -2217,7 +2221,7 @@ var stock_date_date = '';
|
|||||||
stock_date_date = split[2];
|
stock_date_date = split[2];
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
})
|
||||||
if(((materialcode != 0)&&(supplier != 0)))
|
if(((materialcode != 0)&&(supplier != 0)))
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|||||||
@ -93,6 +93,35 @@ if(!empty($PaymentMultiple))
|
|||||||
}}
|
}}
|
||||||
|
|
||||||
?>
|
?>
|
||||||
|
<style>
|
||||||
|
.modal
|
||||||
|
{
|
||||||
|
padding-right:25% ! important;
|
||||||
|
}
|
||||||
|
.dataTables_paginate
|
||||||
|
{
|
||||||
|
margin-top: -5%;
|
||||||
|
}
|
||||||
|
.dataTables_wrapper {
|
||||||
|
padding-bottom: 0px;
|
||||||
|
}
|
||||||
|
.modalfooter
|
||||||
|
{
|
||||||
|
background-color:white; !important
|
||||||
|
}
|
||||||
|
.badge
|
||||||
|
{
|
||||||
|
color:red; background-color:#fff;
|
||||||
|
}
|
||||||
|
|
||||||
|
legend{
|
||||||
|
color:#00c0ef ! important;
|
||||||
|
}
|
||||||
|
|
||||||
|
.content {
|
||||||
|
Padding:0% ! important;
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
||||||
<div class="content-wrapper" style="min-height: 537px;">
|
<div class="content-wrapper" style="min-height: 537px;">
|
||||||
<!-- Content Header (Page header) -->
|
<!-- Content Header (Page header) -->
|
||||||
@ -170,11 +199,16 @@ if(!empty($PaymentMultiple))
|
|||||||
<b><span for="Suppliername">Select Supplier:</span> </b><span style="color:red">*</span></br></br>
|
<b><span for="Suppliername">Select Supplier:</span> </b><span style="color:red">*</span></br></br>
|
||||||
<select class="form-control select2 required" id="supplier" name="supplier">
|
<select class="form-control select2 required" id="supplier" name="supplier">
|
||||||
<option value="-1">Select Supplier</option>
|
<option value="-1">Select Supplier</option>
|
||||||
|
<!-- <option value="1">Create New Supplier</option> -->
|
||||||
</select>
|
</select>
|
||||||
</div></div>
|
</div>
|
||||||
|
</div>
|
||||||
|
<a data-target='#Addsup' data-toggle="modal" href="#Addsup">Add New Supplier</a>
|
||||||
</div><!-- row -->
|
</div><!-- row -->
|
||||||
</div><!-- 12-md-->
|
</div><!-- 12-md-->
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-12"><div class="col-md-3">
|
<div class="col-md-12"><div class="col-md-3">
|
||||||
<input type="checkbox" id="gst" name="gsttoggle" <?php echo $checked;?> > GST
|
<input type="checkbox" id="gst" name="gsttoggle" <?php echo $checked;?> > GST
|
||||||
@ -325,6 +359,7 @@ if(!empty($PaymentMultiple))
|
|||||||
<option value="-1">Select Supplier</option>
|
<option value="-1">Select Supplier</option>
|
||||||
</select>
|
</select>
|
||||||
</div></div>
|
</div></div>
|
||||||
|
<a data-target='#Addsup' data-toggle="modal" href="#Addsup">Add New Supplier</a>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
@ -539,6 +574,72 @@ if(!empty($PaymentMultiple))
|
|||||||
</div><!-- tabcontent-->
|
</div><!-- tabcontent-->
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
</section><!-- content section -->
|
</section><!-- content section -->
|
||||||
|
|
||||||
|
<div>
|
||||||
|
<div align="right">
|
||||||
|
<a data-toggle="modal" class="btn btn-primary" data-dismiss="modal">Add Line Item </a>
|
||||||
|
<div id="Addsup" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
|
||||||
|
<div class="modal-dialog">
|
||||||
|
<!-- <form> -->
|
||||||
|
<div class="modal-content" style="width:1030px;font-size:12px;">
|
||||||
|
<div class="modal-header" style="background-color: #5d0411;color:#fff;">
|
||||||
|
<center><h4> New Supplier Details</h4></center>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-md-10 col-md-offset-1"><br/>
|
||||||
|
<div class="box-body">
|
||||||
|
<div align="left">
|
||||||
|
<legend>Supplier Information</legend>
|
||||||
|
<div class="col-md-12">
|
||||||
|
<div class="col-md-3">
|
||||||
|
<span for="SupplierName">Supplier Name</span><span class="badge">*</span>
|
||||||
|
<input type="text" name="SupplierName" onkeypress="return onlyAlphabets(event);" maxlength="100" id="supplierName" class="form-control" required>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="col-md-3">
|
||||||
|
<span for="ContactNumber">Contact Number</span><span class="badge">*</span>
|
||||||
|
<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)">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
<div class="col-md-3">
|
||||||
|
<span for="AlternateContactNumber">Alternate Contact Number</span>
|
||||||
|
<input type="text" name="AlternateContactNumber" 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">
|
||||||
|
<span for="EmailAddress">Email ID</span><span class="badge">*</span>
|
||||||
|
<input type="email" name="emailid" id="emailid" required maxlength="100" class="form-control">
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<legend>Address Details</legend>
|
||||||
|
<!-- Text input-->
|
||||||
|
<div class="col-md-12" >
|
||||||
|
|
||||||
|
<div class="col-md-12"><span for="Address2">Address</span><span class="badge">*</span>
|
||||||
|
<input type="text" class="form-control required" id="Address" name="Address" maxlength="500" required>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="box-footer modalfooter" style="text-align:right">
|
||||||
|
<a class="btn btn-primary font AddSupplier" ID="AddSupplier" > <span class="bold">Save</span></a>
|
||||||
|
<a class="btn btn-primary" data-dismiss="modal" value="Cancel">Cancel</a>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<!-- </form> -->
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
</div><!-- content-wrapper div-->
|
</div><!-- content-wrapper div-->
|
||||||
<script>
|
<script>
|
||||||
//var drop=$("input[type=radio][name='range']:checked").val()
|
//var drop=$("input[type=radio][name='range']:checked").val()
|
||||||
@ -841,6 +942,7 @@ function loadAccountType(id)
|
|||||||
|
|
||||||
</script>
|
</script>
|
||||||
<!-- old sript above -->
|
<!-- old sript above -->
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
|
||||||
function validate()
|
function validate()
|
||||||
@ -1325,4 +1427,215 @@ function valid(){
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$('#supplier').change(function() {
|
||||||
|
|
||||||
|
var drpval = $('#supplier').val();
|
||||||
|
if(drpval == 1)
|
||||||
|
{
|
||||||
|
//alert()
|
||||||
|
$('#Addsup').modal('show');
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
function onlyAlphabets(evt)
|
||||||
|
{
|
||||||
|
var charCode;
|
||||||
|
if (window.event)
|
||||||
|
charCode = window.event.keyCode; //for IE
|
||||||
|
else
|
||||||
|
charCode = evt.which; //for firefox
|
||||||
|
if (charCode == 32) //for <space> symbol
|
||||||
|
return true;
|
||||||
|
if (charCode > 31 && charCode < 65) //for characters before 'A' in ASCII Table
|
||||||
|
return false;
|
||||||
|
if (charCode > 90 && charCode < 97) //for characters between 'Z' and 'a' in ASCII Table
|
||||||
|
return false;
|
||||||
|
if (charCode > 122) //for characters beyond 'z' in ASCII Table
|
||||||
|
return false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function getContactNumberValidation()
|
||||||
|
{
|
||||||
|
|
||||||
|
var contactNumber = $('#ContactNumber').val();
|
||||||
|
var telephone =/^[0-9]{3,4}\s[0-9]{8,9}$/.test(contactNumber);
|
||||||
|
var regex = /^[0-9]{4,6}\s[0-9]{5,7}$/.test(contactNumber);
|
||||||
|
var mobilephone = /^[0-9]{10,12}$/.test(contactNumber);
|
||||||
|
|
||||||
|
if(contactNumber!='')
|
||||||
|
{
|
||||||
|
|
||||||
|
if(telephone)
|
||||||
|
{
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
else if(regex)
|
||||||
|
{
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else if(mobilephone)
|
||||||
|
{
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
else
|
||||||
|
{
|
||||||
|
alert('Please Enter valid Contact Number ex: 044 12345678 , 0444 1234567,04444 123456 and 9876543210');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
|
||||||
|
alert('please correct format of contact number');
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
function isNumberKey(evt)
|
||||||
|
{
|
||||||
|
var charCode = (evt.which) ? evt.which : evt.keyCode;
|
||||||
|
if (charCode != 46 && charCode != 32 && charCode >= 33
|
||||||
|
&& (charCode < 48 || charCode > 57))
|
||||||
|
return false;
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
function validateEmail() {
|
||||||
|
var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
|
||||||
|
|
||||||
|
var email = $('#emailid').val();
|
||||||
|
|
||||||
|
if(email != '')
|
||||||
|
{
|
||||||
|
if (reg.test(email) == false)
|
||||||
|
{
|
||||||
|
alert('Please Enter Valid Email Address');
|
||||||
|
return (false);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
alert('Please Enter email id');
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function validatesup()
|
||||||
|
{
|
||||||
|
// var a= $('#supplierName').val();
|
||||||
|
// alert(a);
|
||||||
|
|
||||||
|
if($("#supplierName").val().length < 1)
|
||||||
|
{
|
||||||
|
alert('Please Enter Supplier Name');
|
||||||
|
$("#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');
|
||||||
|
$("#Address").focus();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
$('.AddSupplier').click(function()
|
||||||
|
{
|
||||||
|
if(validatesup())
|
||||||
|
{
|
||||||
|
var suppliername = $('#supplierName').val();
|
||||||
|
var contact = $('#ContactNumber').val();
|
||||||
|
var alternatecont = $('#AlternateContactNumber').val();
|
||||||
|
var email = $('#emailid').val();
|
||||||
|
var Address = $('#Address').val();
|
||||||
|
$('#content').loader('show');
|
||||||
|
$.ajax({
|
||||||
|
|
||||||
|
data:{suppliername:suppliername,contact:contact,alternatecont:alternatecont,email:email,Address:Address},
|
||||||
|
type:"POST",
|
||||||
|
url:"<?php echo base_url() ?>cashbook/addNewSupplierCash",
|
||||||
|
|
||||||
|
success:function(data)
|
||||||
|
{
|
||||||
|
// $('#content').loader('hide');
|
||||||
|
// alert(data);
|
||||||
|
// location.reload();
|
||||||
|
|
||||||
|
var alertdata=data;
|
||||||
|
|
||||||
|
$.ajax({
|
||||||
|
|
||||||
|
type:"POST",
|
||||||
|
url:"<?php echo base_url() ?>cashbook/getAllSupplier",
|
||||||
|
success:function(data)
|
||||||
|
{
|
||||||
|
var html = '';
|
||||||
|
$('#supplier').find('option:not(:first)').remove();
|
||||||
|
|
||||||
|
$.each(JSON.parse(data), function (supDet, supobj)
|
||||||
|
{
|
||||||
|
|
||||||
|
// html +="<option value="+supobj.SupplierID+">"+supobj.SupplierName+"</option>";
|
||||||
|
|
||||||
|
$("#supplier").append( $('<option></option>').val(supobj.SupplierID).html(supobj.SupplierID+' - '+supobj.SupplierName));
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
//$("#supplier").append(html);
|
||||||
|
alert(alertdata);
|
||||||
|
$('#supplier option[value="<?php echo $supplier?>"]').prop('selected', true);
|
||||||
|
$('#content').loader('hide');
|
||||||
|
$('#Addsup').modal('hide');
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
@ -184,6 +184,35 @@
|
|||||||
<!-- New login-->
|
<!-- New login-->
|
||||||
<div class="navbar-custom-menu collapse navbar-collapse" id="myNavbar">
|
<div class="navbar-custom-menu collapse navbar-collapse" id="myNavbar">
|
||||||
<ul class="nav navbar-nav">
|
<ul class="nav navbar-nav">
|
||||||
|
<!-- <li class="dropdown tasks-menu">
|
||||||
|
<a href="<?php echo base_url(); ?>user/Favourite">
|
||||||
|
<i class="fa fa-star-half-o"></i>
|
||||||
|
|
||||||
|
</a> -->
|
||||||
|
<!-- start-->
|
||||||
|
<li class="dropdown notifications-menu">
|
||||||
|
<a href="#" class="dropdown-toggle" data-toggle="dropdown" aria-expanded="false"><i class="fa fa-bell-o"></i>
|
||||||
|
<?php $reOrderListing = reOrderListing();
|
||||||
|
if(!empty($reOrderListing)){ ?>
|
||||||
|
<span class="label label-warning"><?php echo sizeof($reOrderListing); ?></span>
|
||||||
|
<?php }?>
|
||||||
|
|
||||||
|
</a>
|
||||||
|
<?php if(sizeof($reOrderListing) !=0){?>
|
||||||
|
<ul class="dropdown-menu">
|
||||||
|
<li class="header">You have <?=sizeof($reOrderListing)?> notifications</li>
|
||||||
|
<?php foreach($reOrderListing as $index=>$list){
|
||||||
|
if($index <5){ ?>
|
||||||
|
<li><a href="#">
|
||||||
|
<i class="fa fa-refresh text-aqua"></i> <?php echo $list->MaterialName?>
|
||||||
|
</a></li>
|
||||||
|
<?php }}?>
|
||||||
|
<li class="footer"><a href="<?php echo base_url()?>shortagematerialListing" target="_blank">View all</a></li>
|
||||||
|
</ul>
|
||||||
|
<?php }?>
|
||||||
|
</li><!-- /. dropdown notifications-menu -->
|
||||||
|
<!-- end-->
|
||||||
|
|
||||||
<!-- User Account: style can be found in dropdown.less -->
|
<!-- User Account: style can be found in dropdown.less -->
|
||||||
<li class="dropdown user user-menu">
|
<li class="dropdown user user-menu">
|
||||||
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
|
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
|
||||||
@ -198,6 +227,7 @@
|
|||||||
<?php } ?>
|
<?php } ?>
|
||||||
<span class="hidden-xs"><?php echo $name; ?></span>
|
<span class="hidden-xs"><?php echo $name; ?></span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<ul class="dropdown-menu">
|
<ul class="dropdown-menu">
|
||||||
<!-- User image -->
|
<!-- User image -->
|
||||||
<li class="user-header">
|
<li class="user-header">
|
||||||
@ -216,6 +246,7 @@
|
|||||||
<small><?php echo $role_text; ?></small>
|
<small><?php echo $role_text; ?></small>
|
||||||
</p>
|
</p>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<!-- Menu Footer-->
|
<!-- Menu Footer-->
|
||||||
<li class="user-footer">
|
<li class="user-footer">
|
||||||
<div class="pull-left">
|
<div class="pull-left">
|
||||||
@ -225,14 +256,15 @@
|
|||||||
<a href="<?php echo base_url(); ?>logout" class="btn btn-default btn-flat">Sign out</a>
|
<a href="<?php echo base_url(); ?>logout" class="btn btn-default btn-flat">Sign out</a>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li><!-- ./dropdown user user-menu closed here -->
|
||||||
<li>
|
<li>
|
||||||
<a href="#" data-toggle="control-sidebar"><i class="fa fa-gears" style="font-size: 20px;"></i></a>
|
<a href="#" data-toggle="control-sidebar"><i class="fa fa-gears" style="font-size: 20px;"></i></a>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav><!-- ./navbar navbar-static-top -->
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<!-- Control Sidebar -->
|
<!-- Control Sidebar -->
|
||||||
@ -253,8 +285,9 @@
|
|||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</aside>
|
</aside>
|
||||||
<!-- /.control-sidebar -->
|
<!-- /.Control-sidebar -->
|
||||||
|
|
||||||
|
<!-- Control Sidebar Vertical ASide-->
|
||||||
<aside class="main-sidebar fixed"><!-- sidebar: style can be found in sidebar.less -->
|
<aside class="main-sidebar fixed"><!-- sidebar: style can be found in sidebar.less -->
|
||||||
<section class="sidebar"><!-- sidebar menu: : style can be found in sidebar.less -->
|
<section class="sidebar"><!-- sidebar menu: : style can be found in sidebar.less -->
|
||||||
<ul class="sidebar-menu">
|
<ul class="sidebar-menu">
|
||||||
@ -276,18 +309,15 @@
|
|||||||
$menu = $favget->Menu_URL;
|
$menu = $favget->Menu_URL;
|
||||||
//echo $menu?>
|
//echo $menu?>
|
||||||
<li><a href='<?php echo base_url().$menu ?>'>
|
<li><a href='<?php echo base_url().$menu ?>'>
|
||||||
|
<span><?php echo $favget->Menu_Name ?></span>
|
||||||
<!-- <i class="fa fa-arrow-circle-up"></i>
|
|
||||||
--> <span><?php echo $favget->Menu_Name ?></span>
|
|
||||||
</a>
|
</a>
|
||||||
<?php
|
<?php }} ?>
|
||||||
}} ?>
|
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li><!-- quick acces active tree closed here-->
|
||||||
<!-- Dashboard Starts -->
|
|
||||||
|
|
||||||
|
<!-- Dashboard Starts -->
|
||||||
<li class="active treeview">
|
<li class="active treeview">
|
||||||
<a href="<?php echo base_url(); ?>dashboard">
|
<a href="<?php echo base_url(); ?>dashboard">
|
||||||
<i class="fa fa-dashboard"></i><span>Dashboard</span>
|
<i class="fa fa-dashboard"></i><span>Dashboard</span>
|
||||||
@ -310,6 +340,7 @@
|
|||||||
<span class="fa fa-angle-down pull-right"></span>
|
<span class="fa fa-angle-down pull-right"></span>
|
||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
<ul class="treeview-menu">
|
<ul class="treeview-menu">
|
||||||
|
|
||||||
<?php if($DEPCode == FINANCE){?>
|
<?php if($DEPCode == FINANCE){?>
|
||||||
@ -533,10 +564,10 @@
|
|||||||
<i class="fa fa-adjust"></i> <span>Material Adjustment List</span>
|
<i class="fa fa-adjust"></i> <span>Material Adjustment List</span>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
</ul></li>
|
</ul>
|
||||||
|
</li>
|
||||||
|
|
||||||
<?php } }
|
<?php } }
|
||||||
|
|
||||||
else{
|
else{
|
||||||
$check25=0;
|
$check25=0;
|
||||||
foreach($DepAccesslist as $dep){
|
foreach($DepAccesslist as $dep){
|
||||||
@ -560,15 +591,12 @@ else{
|
|||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<li>
|
<li>
|
||||||
<a href="<?php echo base_url(); ?>FinalProductHistory">
|
<a href="<?php echo base_url(); ?>FinalProductHistory">
|
||||||
<i class="fa fa-bar-chart"></i> <span>Finished Product History</span>
|
<i class="fa fa-bar-chart"></i> <span>Finished Product History</span>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
|
|
||||||
<li>
|
<li>
|
||||||
<a href="<?php echo base_url(); ?>FinalProductlisting">
|
<a href="<?php echo base_url(); ?>FinalProductlisting">
|
||||||
<i class="fa fa-bar-chart"></i> <span>Final Product Listing</span>
|
<i class="fa fa-bar-chart"></i> <span>Final Product Listing</span>
|
||||||
@ -581,7 +609,6 @@ else{
|
|||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
|
|
||||||
<li>
|
<li>
|
||||||
<a href="<?php echo base_url(); ?>MaterailAdjustmentlist">
|
<a href="<?php echo base_url(); ?>MaterailAdjustmentlist">
|
||||||
<i class="fa fa-adjust"></i> <span>Material Adjustment List</span>
|
<i class="fa fa-adjust"></i> <span>Material Adjustment List</span>
|
||||||
@ -592,7 +619,8 @@ else{
|
|||||||
<i class="fa fa-history"></i> <span>Material History</span>
|
<i class="fa fa-history"></i> <span>Material History</span>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
</ul></li>
|
</ul>
|
||||||
|
</li>
|
||||||
|
|
||||||
<?php } if($check25 == 1){break;} } } ?>
|
<?php } if($check25 == 1){break;} } } ?>
|
||||||
|
|
||||||
@ -772,9 +800,7 @@ else{
|
|||||||
<span>Amendment Purchase Order </span>
|
<span>Amendment Purchase Order </span>
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<?php }?>
|
<?php }?>
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<?php }?>
|
<?php }?>
|
||||||
@ -854,7 +880,6 @@ else{
|
|||||||
<?php } if($check1 ==2){break;}?>
|
<?php } if($check1 ==2){break;}?>
|
||||||
|
|
||||||
<?php }?>
|
<?php }?>
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<?php foreach($DepAccesslist as $dep){$assd= $dep->AssDep; $check1=1;?>
|
<?php foreach($DepAccesslist as $dep){$assd= $dep->AssDep; $check1=1;?>
|
||||||
@ -934,7 +959,6 @@ else{
|
|||||||
</a>
|
</a>
|
||||||
<ul class="treeview-menu">
|
<ul class="treeview-menu">
|
||||||
<li>
|
<li>
|
||||||
|
|
||||||
<a href="<?php echo base_url(); ?>Bankingview">
|
<a href="<?php echo base_url(); ?>Bankingview">
|
||||||
<i class="fa fa-credit-card"></i>
|
<i class="fa fa-credit-card"></i>
|
||||||
<span>Bank Statement Upload</span>
|
<span>Bank Statement Upload</span>
|
||||||
@ -1016,6 +1040,7 @@ else{
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
|
|
||||||
<li class="treeview">
|
<li class="treeview">
|
||||||
<a href="">
|
<a href="">
|
||||||
<i class="fa fa-money"></i>
|
<i class="fa fa-money"></i>
|
||||||
@ -1155,8 +1180,6 @@ else{
|
|||||||
</li>
|
</li>
|
||||||
|
|
||||||
<?php }?> -->
|
<?php }?> -->
|
||||||
|
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
</li>
|
</li>
|
||||||
<?php }?>
|
<?php }?>
|
||||||
@ -1505,7 +1528,7 @@ else{
|
|||||||
|
|
||||||
</ul> <!-- imp first Unorder list closed-->
|
</ul> <!-- imp first Unorder list closed-->
|
||||||
</section>
|
</section>
|
||||||
</aside>
|
</aside><!-- /. Control Sidebar Vertical ASide-->
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
90
application/views/shortagematerialListing.php
Normal file
90
application/views/shortagematerialListing.php
Normal file
@ -0,0 +1,90 @@
|
|||||||
|
|
||||||
|
<style>
|
||||||
|
.pagination {
|
||||||
|
margin:0px !important;
|
||||||
|
}
|
||||||
|
|
||||||
|
</style>
|
||||||
|
<div class="content-wrapper">
|
||||||
|
<!-- Content Header (Page header) -->
|
||||||
|
|
||||||
|
<!-- Main content -->
|
||||||
|
<section class="content">
|
||||||
|
<div class="row">
|
||||||
|
<div class="col-xs-12">
|
||||||
|
<div class="box">
|
||||||
|
<div class="box-header">
|
||||||
|
<!-- <center><h3 class="box-title">Siddharth Industries - ReOrder Level List</h3></center> -->
|
||||||
|
|
||||||
|
<center><h3 class="box-title"><?php echo $pageTitle?></h3></center>
|
||||||
|
</div>
|
||||||
|
<!-- /.box-header -->
|
||||||
|
<div class="box-body">
|
||||||
|
<!-- <table id="dataTableHistoriek" class="table table-bordered table-hover editableTable" style="font-size:12px;">
|
||||||
|
<thead>
|
||||||
|
<tr style="background-color:#ddf"> -->
|
||||||
|
<table id="dataTableHistoriek" class="table table-hover table-bordered editableTable" style="background-color:#fff;font-size:12px;" >
|
||||||
|
<thead style="background-color:#ddf">
|
||||||
|
<tr>
|
||||||
|
<th>#</th>
|
||||||
|
<th style="text-align:center">Material Code</th>
|
||||||
|
<th style="text-align:center">Material Name</th>
|
||||||
|
<th style="text-align:center">Available Quantity</th>
|
||||||
|
<th style="text-align:center">Reorder Level</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody><?php
|
||||||
|
if(!empty($Records))
|
||||||
|
{
|
||||||
|
$index = 0;
|
||||||
|
foreach($Records as $index=>$re)
|
||||||
|
{
|
||||||
|
$index = $index + 1;
|
||||||
|
?>
|
||||||
|
<tr id="<?php echo $index ; ?>">
|
||||||
|
<td align="left"><?php echo $index ; ?></td>
|
||||||
|
<td style="text-align:center"><span><?php echo $re->MaterialCode;?></span></td>
|
||||||
|
<td style="text-align:center"><span><?php echo $re->MaterialName;?></span></td>
|
||||||
|
<td style="text-align:center"><span><?php echo $re->Current_stock;?></span></td>
|
||||||
|
<td style="text-align:center"><span><?php echo $re->reorder;?></span></td>
|
||||||
|
</tr>
|
||||||
|
<?php
|
||||||
|
}
|
||||||
|
}
|
||||||
|
?>
|
||||||
|
</tbody>
|
||||||
|
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
<!-- /.box-body -->
|
||||||
|
</div>
|
||||||
|
<!-- /.box -->
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<!-- /.col -->
|
||||||
|
</div>
|
||||||
|
<!-- /.row -->
|
||||||
|
</section>
|
||||||
|
<!-- /.content -->
|
||||||
|
</div>
|
||||||
|
<!-- /.content-wrapper -->
|
||||||
|
<!-- <script src="https://cdn.datatables.net/plug-ins/1.10.11/sorting/date-eu.js"></script> -->
|
||||||
|
<script src="https://cdn.datatables.net/plug-ins/1.10.16/sorting/datetime-moment.js"></script>
|
||||||
|
|
||||||
|
<script>
|
||||||
|
|
||||||
|
$(function () {
|
||||||
|
$.fn.dataTable.moment( 'DD-MM-YYYY' );
|
||||||
|
$('#dataTableHistoriek').DataTable({
|
||||||
|
"paging" : true,
|
||||||
|
"ordering" : true,
|
||||||
|
"scrollCollapse" : true,
|
||||||
|
"aaSorting": [[ 3, "desc" ]],
|
||||||
|
"searching" : true,
|
||||||
|
|
||||||
|
//"columnDefs" : [{"targets":3, "type":"date"}],
|
||||||
|
|
||||||
|
"bInfo": true
|
||||||
|
});
|
||||||
|
});
|
||||||
|
</script>
|
||||||
Loading…
Reference in New Issue
Block a user