SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rich text

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-09-09 18:01:00 +05:30
parent 59b563c7f2
commit e6346e50b5
6 changed files with 182 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/controllers/amendmentpurchaseorder.php
View File

@ -1068,6 +1068,7 @@ function UpdateAmendServicePurchaseOrder()
echo 'Purchase Order'.$PONO.'Amended Successfully! New PO Number Is: '.$NewPO ;
}
function EditAmendImportPO()
{
@ -1343,7 +1344,7 @@ function UpdateAmendServicePurchaseOrder()
$QuantityKG = $this->input->post('QuantityKG'.$i);
$specialinstruction=$this->input->post('Addinstruction'.$i);
//$POLineItemNo = $this->input->post('LineItemNo'.$i);
$CostCenter = $this->input->post('costCode'.$i);
@ -1504,7 +1505,7 @@ function UpdateAmendServicePurchaseOrder()
$POLineItemList = array('PONO'=>$NewPO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'AmendedDetails'=>$CAD,'Per'=>$per);
$POLineItemList = array('PONO'=>$NewPO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'AmendedDetails'=>$CAD,'Per'=>$per,'ServiceMaterialDescription'=>$specialinstruction);
//print_r($POLineItemList);
$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);

14
application/controllers/purchaseorder.php
View File

@ -1446,6 +1446,10 @@ function addNewImportPurchaseOrder()
$Freightrate=$this->input->post('FreightRate'.$i);
$Freightamount=$this->input->post('AfterFreightRate'.$i);
$specialinstruction=$this->input->post('Addinstruction'.$i);
//echo $specialinstruction;
$per=$this->input->post('Per'.$i);
@ -1468,7 +1472,7 @@ function addNewImportPurchaseOrder()
}
if($SkipInsert == "False")
{
$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'Per'=>$per);
$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'Per'=>$per,'ServiceMaterialDescription'=>$specialinstruction);
//print_r($POLineItemList);
//die();
@ -1704,6 +1708,9 @@ function addNewImportPurchaseOrder()
$FreightRate=$this->input->post('FreightValue'.$i);
$FreightAmount=$this->input->post('AfterFreightValue'.$i);
$specialinstruction=$this->input->post('Addinstruction'.$i);
$per=$this->input->post('Per'.$i);
// echo $per;
//die();
@ -1731,7 +1738,7 @@ function addNewImportPurchaseOrder()
{
if(strlen($POLineItemNo) == 0)
{
$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'Per'=>$per);
$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'Per'=>$per,'ServiceMaterialDescription'=>$specialinstruction);
$POLineItem=$this->purchaseorder_model->addPOLineItem($POLineItemList);
if(count($POLineItem)>0)
{
@ -1748,7 +1755,7 @@ function addNewImportPurchaseOrder()
//echo $LineItemNo;
//die();
$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'UpdatedOn'=>$updateddt,'CostCenterCode'=>$CostCenter,'Per'=>$per);
$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'UpdatedOn'=>$updateddt,'CostCenterCode'=>$CostCenter,'Per'=>$per,'ServiceMaterialDescription'=>$specialinstruction);
$POLineItem = $this->purchaseorder_model->updatePOLineItem($PONO,$POLineItemNo,$POLineItemList);
}
@ -1790,6 +1797,7 @@ function addNewImportPurchaseOrder()
echo 'Purchase Order Updated Successfully! PO Number Is: '.$PONO ;
}
/* All Function following This command for FINANCE TEAM PO APPROVAL SCREEN*/

2
application/models/purchaseorder_model.php
View File

@ -865,7 +865,7 @@ function GetImportPurchaseOrderDetails($PONO = '')
Mat.UOM,Quantity,Rate,Req.Status,ROUND((Quantity *Rate),2 ) as BasicValue,ReceivedQuantity,
QuantityRejected,ROUND(Quantity-ReceivedQuantity)as PendingQty,Per,
ROUND((RMCIncludingCustomersPerKG*Quantity),2)as Taxamount,LandingCharge,HighSeasSalesCharge,CustomDuty,ExciseDuty,ExciseDutyEdCess,CustomEdCess,POMast.ExchangeRate,AfterLandingCharge,AfterHighSeasSalesCharge,AfterCustomDuty,AfterExciseDuty,AfterExciseDutyEdCess,AddlExciseDuty,AfterAddlExciseDuty,Grossdutypayable,AvailableModvat,Grossexpensesduetocustomduty,purchaseratePerKG,CustomDutyExpensesPerKG,RMCIncludingCustomersPerKG,QuantityKG,BasicPriceInMTon,ProductPrice,CustomSHCess,AfterCustomSHCess,AfterExciseDutySHCess,ExciseDutySHCess,
AfterCustomEdCess,ROUND((Quantity *Rate),2)as TotalOrderValue,ROUND((POMast.ExchangeRate*BasicPriceInMTon),2) as BasicINRValue,TotalValue,CurrencyType,ReceivedQuantity,Tax.*,
AfterCustomEdCess,ROUND((Quantity *Rate),2)as TotalOrderValue,ROUND((POMast.ExchangeRate*BasicPriceInMTon),2) as BasicINRValue,TotalValue,CurrencyType,ReceivedQuantity,Tax.*,LineItem.ServiceMaterialDescription,
Req.CostCenterCode,Dept.DepartmentName FROM T_PurchaseOrder_LineItem LineItem
join T_PurchaseOrder_Master POMast on POMast.PONO = LineItem.PONO

27
application/views/editImportAmendPO.php
View File

@ -222,6 +222,14 @@ if(!empty($RequistionDetails))
statusbar: false,
toolbar: false
});
tinymce.init({
selector: "textarea#edittxtInstruction",
menubar: false,
statusbar: false,
toolbar: false
});
</script>
@ -1389,6 +1397,15 @@ if(!empty($RequistionDetails))
</div>
</div>
</div>
<div class="col-md-12">
<div class="col-md-12">
<label>Special Instructions :</label>
<?php
$data = array('name' => 'edittxtInstruction','value' => set_value('edittxtInstruction'),'id'=>'edittxtInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' );
echo form_textarea($data);
?>
</div>
</div>
</div>
<div class="modal-footer">
@ -1716,6 +1733,9 @@ if(!empty($RequistionDetails))
<input type="hidden" name="<?php echo 'beforePer'.$index ?>" id="<?php echo 'beforePer'.$index ?>" value="<?php echo $record->Per; ?>" />
<input type="hidden" name="<?php echo 'Addinstruction'.$index ?>" id="<?php echo 'Addinstruction'.$index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
@ -3482,6 +3502,8 @@ $('#editimportpomodel').on("shown.bs.modal", function(e) {
$('#EditAmendPer').val($("#Per"+userid).val());
tinyMCE.get('edittxtInstruction').setContent($('#Addinstruction'+userid).val());
var FreightType = $('#drpamendFreight').val();
if (FreightType == "PER TRIP")
@ -3600,6 +3622,9 @@ $('.EditImport').click(function(){
var FreightRateAmount=$('#AmendtxtAfterFreight').val();
var Nooftrip=$('#AmendNOOfTrips').val();
var spclins=$.trim(tinymce.get('edittxtInstruction').getContent());
var FreightTypename = $('#drpamendFreight').val();
if (FreightTypename != "PER TRIP")
{
@ -3684,6 +3709,8 @@ $('.EditImport').click(function(){
$('#Per'+userid).val(per.trim());
$('#Addinstruction'+userid).val(spclins);
// var a=$('#FreightType'+userid).val();

75
application/views/editimportpo.php
View File

@ -248,6 +248,35 @@ if(!empty($RequistionDetails))
statusbar: false,
toolbar: false
});
tinymce.init({
selector: "textarea#addtxtInstruction",
menubar: false,
statusbar: false,
toolbar: false
});
tinymce.init({
selector: "textarea#edittxtInstruction",
menubar: false,
statusbar: false,
toolbar: false
});
tinymce.init({
selector: "textarea#viewtxtInstruction",
menubar: false,
statusbar: false,
toolbar: false
});
//Initialize Select2 Elements
//$("#drpSupplier").select2();
$("#currencytype").select2();
@ -1423,6 +1452,16 @@ if($PONOStatus == PO_RELEASED)
</div>
</div>
<div class="col-md-12">
<div class="col-md-12">
<label>Special Instructions :</label>
<?php
$data = array('name' => 'addtxtInstruction','value' => set_value('addtxtInstruction'),'id'=>'addtxtInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' );
echo form_textarea($data);
?>
</div>
</div>
</div>
</div>
@ -2053,6 +2092,16 @@ if($PONOStatus == PO_RELEASED)
</div>
</div>
<div class="col-md-12">
<div class="col-md-12">
<label>Special Instructions :</label>
<?php
$data = array('name' => 'edittxtInstruction','value' => set_value('edittxtInstruction'),'id'=>'edittxtInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' );
echo form_textarea($data);
?>
</div>
</div>
</div>
<div class="modal-footer">
<a class="btn btn-primary font EditImport" ID="EditImport" > &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
@ -2667,6 +2716,16 @@ if($PONOStatus == PO_RELEASED)
</div>
</div>
<div class="col-md-12">
<div class="col-md-12">
<label>Special Instructions :</label>
<?php
$data = array('name' => 'viewtxtInstruction','value' => set_value('viewtxtInstruction'),'id'=>'viewtxtInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' );
echo form_textarea($data);
?>
</div>
</div
</div>
<div class="modal-footer">
<!-- <a class="btn btn-primary font EditImport" ID="EditImport" ><i class="fa fa-plus" ></i>&nbsp;&nbsp;<span class="bold">Edit Import</span></a> -->
@ -2837,6 +2896,10 @@ if($PONOStatus == PO_RELEASED)
<input type="hidden" name="<?php echo 'Per'.$index ?>" id="<?php echo 'Per'.$index ?>" value="<?php echo $record->Per; ?>" />
<input type="hidden" name="<?php echo 'Addinstruction'.$index ?>" id="<?php echo 'Addinstruction'.$index ?>" value="<?php echo $record->ServiceMaterialDescription; ?>" />
<?php
@ -4714,6 +4777,7 @@ $('.AddImport').click(function()
var Freightrate=$('#addtxtFreight').val();
var AfterFreightAmount=$('#addtxtAfterFreight').val();
var splins=$.trim(tinymce.get('addtxtInstruction').getContent());
var per=$('#AddPer').val();
if(per=='')
@ -4814,6 +4878,9 @@ $('.AddImport').click(function()
addHidden(theForm,"Per"+temp,per.trim());
addHidden(theForm,"Addinstruction"+temp,splins.trim());
//var a=parseFloat($('#AfterCustomEDcess').val());
//console.log(a);
@ -4920,7 +4987,7 @@ $("#viewimportmodal").on("shown.bs.modal", function(e) {
$('#viewNOOfTrips').val($("#NoOfTrip"+userid).val());
$('#viewtxtFreight').val($("#FreightValue"+userid).val());
$('#viewtxtAfterFreight').val($("#AfterFreightValue"+userid).val());
tinyMCE.get('viewtxtInstruction').setContent($('#Addinstruction'+userid).val());
var FreightType = $('#drpviewFreight').val();
@ -5321,7 +5388,9 @@ $("#editimportpomodel").on("shown.bs.modal", function(e) {
$('#edittxtAfterFreight').val($("#AfterFreightValue"+userid).val());
$('#EditPer').val($("#Per"+userid).val());
tinyMCE.get('edittxtInstruction').setContent($('#Addinstruction'+userid).val());
var FreightType = $('#drpeditFreight').val();
@ -5435,7 +5504,7 @@ if(validateEditExceedLimit() && ExceedEditQuantityCheck()&&EditQtyZerocheck())
var TotalExp=$('#EdittxtBasicValue').val();
//alert(itemRate);
//console.log(GrossDuty);
var spclins=$.trim(tinymce.get('edittxtInstruction').getContent());
var FreightType=$('#drpeditFreight').val();
var FreightRate=$('#edittxtFreight').val();
@ -5515,6 +5584,8 @@ if(validateEditExceedLimit() && ExceedEditQuantityCheck()&&EditQtyZerocheck())
$('#AfterFreightValue'+userid).val(FreightRateAmount);
$('#Per'+userid).val(per.trim());
$('#Addinstruction'+userid).val(spclins);
// var a=parseFloat($('#ProductPrice'+userid).val());
// console.log(a);
// var a=$('#FreightType'+userid).val();

69
application/views/importpo.php
View File

@ -89,6 +89,25 @@ $("#PaymentTerms").select2();
statusbar: false,
toolbar: false
});
tinymce.init({
selector: "textarea#addtxtInstruction",
menubar: false,
statusbar: false,
toolbar: false
});
tinymce.init({
selector: "textarea#edittxtInstruction",
menubar: false,
statusbar: false,
toolbar: false
});
//Initialize Select2 Elements for currency type
$("#currencytype").select2();
@ -1280,6 +1299,16 @@ else if($('#addsupplierreference').val()=='')
</div>
<div class="modal-footer">
<div class="col-md-12">
<div class="col-md-12">
<label>Special Instructions :</label>
<?php
$data = array('name' => 'addtxtInstruction','value' => set_value('addtxtInstruction'),'id'=>'addtxtInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' );
echo form_textarea($data);
?>
</div>
</div>
<a class="btn btn-primary font AddImport" ID="AddImport" > &nbsp;&nbsp;<span class="bold">Add Import</span></a>
<!--<a class="btn btn-primary font AddService" ID="AddService" ><i class="fa fa-plus"></i>&nbsp;&nbsp;<span class="bold">Add Service</span></a>-->
@ -1899,6 +1928,17 @@ else if($('#addsupplierreference').val()=='')
</div>
</div>
<div class="col-md-12">
<div class="col-md-12">
<label>Special Instructions :</label>
<?php
$data = array('name' => 'edittxtInstruction','value' => set_value('edittxtInstruction'),'id'=>'edittxtInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' );
echo form_textarea($data);
?>
</div>
</div>
</div>
<div class="modal-footer">
<a class="btn btn-primary font EditImport" ID="EditImport" > &nbsp;&nbsp;<span class="bold">Edit Import</span></a>
@ -3908,7 +3948,15 @@ $('.AddImport').click(function()
var Nooftrip=$('#NOOfTrips').val();
var Freightrate=$('#txtFreight').val();
var AfterFreightAmount=$('#txtAfterFreight').val();
//var splins=$('#addtxtInstruction').val();
// var splins=tinymce.get('addtxtInstruction').getContent();
// console.log(splins);
// tinyMCE.triggerSave(false, true);
// var splins= $.trim('#addtxtInstruction').val();
var splins=$.trim(tinymce.get('addtxtInstruction').getContent());
// alert(splins);
var per=$('#AddPer').val();
if(per=='')
{
@ -4008,15 +4056,18 @@ $('.AddImport').click(function()
addHidden(theForm,"AfterFreightRate"+temp,AfterFreightAmount);
addHidden(theForm,"Per"+temp,per.trim());
addHidden(theForm,"Addinstruction"+temp,splins.trim());
// alert(JSON.stringify(totalexp));
//var a=$('#Per'+temp).val();
//var a=$('#Addinstruction'+temp).val();
// var b=$('#NoofTrip'+temp).val();
// var c=$('#FreightRate'+temp).val();
// var d=$('#AfterFreightRate'+temp).val();
//console.log(a);
//console.log(a);
// console.log(b);
// console.log(c);
// console.log(d);
@ -4203,6 +4254,10 @@ function clearTaxField()
$('#txtAfterFreight').val('');
$('#AddPer').val('');
//$('#addtxtInstruction').val('');
//tinymce.get('addtxtInstruction').setContent('');
}
@ -4283,6 +4338,10 @@ $("#editimportpomodel").on("shown.bs.modal", function(e) {
$('#txtEditFreight').val($('#FreightRate'+userid).val());
$('#edittxtAfterFreight').val($('#AfterFreightRate'+userid).val());
//$('#edittxtInstruction').val($('#Addinstruction'+userid).val());
tinyMCE.get('edittxtInstruction').setContent($('#Addinstruction'+userid).val());
var FreightType = $('#drpeditFreight').val();
if (FreightType == "PER TRIP")
{
@ -4398,6 +4457,10 @@ $('.EditImport').click(function(){
var Nooftrip=$('#editNOOfTrips').val();
var per=$('#EditPer').val();
var spclins=$.trim(tinymce.get('edittxtInstruction').getContent());
//console.log(spclins);
if (per=='')
{
per=$('#EditUOM').val();
@ -4474,6 +4537,8 @@ if (FreightTypename != "PER TRIP")
$('#Per'+userid).val(per);
$('#Addinstruction'+userid).val(spclins);
// var a=$('#FreightType'+userid).val();
// var b=$('#NoofTrip'+userid).val();