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

NEW CHANGES IN AMEND REVENUE AND EMERGENCY REVENEUE

Browse Source
This commit is contained in:
velz2020 2017-09-17 18:29:33 +05:30
parent d27e37971a
commit 9828d77cec
4 changed files with 301 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
application/controllers/amendmentpurchaseorder.php
View File

@ -283,7 +283,18 @@ class amendmentpurchaseorder extends BaseController
$DeliverySchedule = ''; $DeliverySchedule = '';
} }
$Modeofshipment=$this->input->post('addmodeofshipment');
$supplierreference=$this->input->post('amendsupplierreference');
$supplieroffno=$this->input->post('amendsupplierofferno');
$otherreference=$this->input->post('amendotherreference');
$fincap=$this->input->post('amendfincap');
$revenuetype=$this->input->post('PoTypeOptions');
$insurancestatus=$this->input->post('insurancestatus');
if($insurancestatus == 1){
$insuranceno=$this->input->post('insuranceno');
}else{
$insuranceno="";
}
$POType = $this->input->post('POType'); $POType = $this->input->post('POType');
@ -333,8 +344,8 @@ class amendmentpurchaseorder extends BaseController
} }
$POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID,'POType'=>$POType,'CapitalRange'=>$PoRange,'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>PO_RELEASED,'PaymentTerms'=>$PaymentTerms,'PaymentOtherDescription'=>$Otherpayment,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpecialInstruction,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'ReleasedBy'=>$updatedBy,'ReleasedOn'=>$updateddt,'AmendedDetails'=>$MAD); $POMaster = array('ParentPO'=>$PONO,'SupplierID'=>$SupplierID,'POType'=>$POType,'PORange'=>$PoRange,'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>PO_RELEASED,'PaymentTerms'=>$PaymentTerms,'PaymentOtherDescription'=>$Otherpayment,'Mode_Of_Shipment'=>$Modeofshipment,'Supplier_Reference'=>$supplierreference,'Supplier_Offer_No'=>$supplieroffno,'Other_Reference'=>$otherreference,'Fincap'=>$fincap,'InsuranceStatus'=>$insurancestatus,'InsuranceNumber'=>$insuranceno,'POSubType'=>$revenuetype,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpecialInstruction,'CreatedBy'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'ReleasedBy'=>$updatedBy,'ReleasedOn'=>$updateddt,'AmendedDetails'=>$MAD);
//print_r($POMaster); print_r($POMaster);
@ -372,6 +383,8 @@ class amendmentpurchaseorder extends BaseController
$Reqnumber = $this->input->post('Reqnumber'.$i); $Reqnumber = $this->input->post('Reqnumber'.$i);
$itemRate = $this->input->post('itemRate'.$i); $itemRate = $this->input->post('itemRate'.$i);
$preitemrate=$this->input->post('beforeitemRate'.$i); $preitemrate=$this->input->post('beforeitemRate'.$i);
$per=$this->input->post('per'.$i);
$servicematerialdescription=$this->input->post('service_description'.$i);
$DiscountType = $this->input->post('DisType'.$i); $DiscountType = $this->input->post('DisType'.$i);
$beforeDiscountType = $this->input->post('beforeDisType'.$i); $beforeDiscountType = $this->input->post('beforeDisType'.$i);
@ -542,8 +555,8 @@ class amendmentpurchaseorder extends BaseController
$POLineItemList = array('PONO'=>$NewPO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'ReceivedQuantity'=>$RecQtyvalue,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency,'AmendedDetails'=>$CAD); $POLineItemList = array('PONO'=>$NewPO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'ReceivedQuantity'=>$RecQtyvalue,'Quantity'=>$Quantity,'Per'=>$per,'ServiceMaterialDescription'=>$servicematerialdescription,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency,'AmendedDetails'=>$CAD);
//print_r($POLineItemList); print_r($POLineItemList);
$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList); $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
@ -554,7 +567,7 @@ class amendmentpurchaseorder extends BaseController
$RevenueTaxList = array('LineItemNo'=>$LineItemNo, 'DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType,'NoOfTrip'=>$NoofTrips,'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'SGST'=>$VatValue,'AfterSGST'=>$AfterVatValue,'CGST'=>$GSTValue,'AfterCGST'=>$AfterGSTValue,'IGST'=>$OtherTaxValue,'AfterIGST'=>$AfterOtherTaxValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt); $RevenueTaxList = array('LineItemNo'=>$LineItemNo, 'DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType,'NoOfTrip'=>$NoofTrips,'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'SGST'=>$VatValue,'AfterSGST'=>$AfterVatValue,'CGST'=>$GSTValue,'AfterCGST'=>$AfterGSTValue,'IGST'=>$OtherTaxValue,'AfterIGST'=>$AfterOtherTaxValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt);
// print_r($RevenueTaxList); print_r($RevenueTaxList);
$RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList); $RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList);
} }
@ -565,6 +578,7 @@ class amendmentpurchaseorder extends BaseController
function UpdateAmendServicePurchaseOrder() function UpdateAmendServicePurchaseOrder()
{ {

32
application/controllers/emergencypurchaseorder.php
View File

@ -264,7 +264,7 @@ class emergencypurchaseorder extends BaseController
function addNewRevenuePurchaseOrder() function addNewRevenuePurchaseOrder()
{ {
//echo "Emergency Revenue PO";
$POdt =$this->input->post('PODate'); $POdt =$this->input->post('PODate');
$PODate = $this->getDateformat($POdt); $PODate = $this->getDateformat($POdt);
$SupplierID = $this->input->post('drpSupplier'); $SupplierID = $this->input->post('drpSupplier');
@ -279,6 +279,19 @@ class emergencypurchaseorder extends BaseController
$Deliverydt = $this->getDateformat($dt); $Deliverydt = $this->getDateformat($dt);
$DeliverySchedule = ''; $DeliverySchedule = '';
} }
$Modeofshipment=$this->input->post('emergmodeofshipment');
$supplierreference=$this->input->post('emergsupplierreference');
$supplieroffno=$this->input->post('emergsupplierofferno');
$otherreference=$this->input->post('emergotherreference');
$fincap=$this->input->post('emergfincap');
$revenuetype=$this->input->post('PoTypeOptions');
$insurancestatus=$this->input->post('insuranceStatus');
if($insurancestatus == 1){
$insuranceno=$this->input->post('insuranceNo');
}else{
$insuranceno="";
}
$CostCenterName = $this->input->post('CostCenterName'); $CostCenterName = $this->input->post('CostCenterName');
$POType = $this->input->post('POType'); $POType = $this->input->post('POType');
$PoRange = $this->input->post('txtPoRange'); $PoRange = $this->input->post('txtPoRange');
@ -290,6 +303,7 @@ class emergencypurchaseorder extends BaseController
$CreateBy = $this->session->userdata ( 'userId' ); $CreateBy = $this->session->userdata ( 'userId' );
$RowCount = $this->input->post('TextRowCount'); $RowCount = $this->input->post('TextRowCount');
//echo $RowCount;
$DeletedRow = $this->input->post('TextDeletedRowCount'); $DeletedRow = $this->input->post('TextDeletedRowCount');
$RequestedBy = $this->session->userdata ('EmpID'); $RequestedBy = $this->session->userdata ('EmpID');
$ReqStatus = REQITEM_Emergency_PO_CREATED; $ReqStatus = REQITEM_Emergency_PO_CREATED;
@ -314,8 +328,8 @@ class emergencypurchaseorder extends BaseController
$RegNo = $Req[0]['ReqNo']; $RegNo = $Req[0]['ReqNo'];
} }
// PO Master // PO Master
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'CapitalRange'=>$Local_Interstate,'PaymentOtherDescription'=>$OtherPayment); $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'PORange'=>$Local_Interstate,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'CapitalRange'=>$Local_Interstate,'PaymentOtherDescription'=>$OtherPayment,'Mode_Of_Shipment'=>$Modeofshipment,'Supplier_Offer_No'=>$supplieroffno,'Supplier_Reference'=>$supplierreference,'Other_Reference'=>$otherreference,'InsuranceNumber'=>$insuranceno,'InsuranceStatus'=>$insurancestatus,'Fincap'=>$fincap,'POSubType'=>$revenuetype);
//print_r($POList);
$POMaster = $this->purchaseorder_model->addPOMaster($POList); $POMaster = $this->purchaseorder_model->addPOMaster($POList);
$PONO = ''; $PONO = '';
@ -323,7 +337,7 @@ class emergencypurchaseorder extends BaseController
{ {
$PONO = $POMaster[0]['PONO']; $PONO = $POMaster[0]['PONO'];
} }
//echo $PONO;
// PO Line Items // PO Line Items
$RegDetailsStatus=REQITEM_POCREATED; $RegDetailsStatus=REQITEM_POCREATED;
$LineItemStatus = REQITEM_NEW; $LineItemStatus = REQITEM_NEW;
@ -335,7 +349,8 @@ class emergencypurchaseorder extends BaseController
$Quantity = $this->input->post('quantity'.$i); $Quantity = $this->input->post('quantity'.$i);
$Reqnumber = $this->input->post('Reqnumber'.$i); $Reqnumber = $this->input->post('Reqnumber'.$i);
$itemRate = $this->input->post('itemRate'.$i); $itemRate = $this->input->post('itemRate'.$i);
$per = $this->input->post('per'.$i);
$DiscountType = $this->input->post('DisType'.$i); $DiscountType = $this->input->post('DisType'.$i);
$DiscountValue = $this->input->post('DisVal'.$i); $DiscountValue = $this->input->post('DisVal'.$i);
$AfterDiscount = $this->input->post('AfterDisVal'.$i); $AfterDiscount = $this->input->post('AfterDisVal'.$i);
@ -350,6 +365,7 @@ class emergencypurchaseorder extends BaseController
$NOOfTrip = $this->input->post('NoOfTrip'.$i); $NOOfTrip = $this->input->post('NoOfTrip'.$i);
$InsuranceValue = $this->input->post('Insval'.$i); $InsuranceValue = $this->input->post('Insval'.$i);
$TotalOrderValue = $this->input->post('TotalOrderValue'.$i); $TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
$revenuedescription = $this->input->post('service_description'.$i);
$CostCenter = $this->input->post('costCode'.$i); $CostCenter = $this->input->post('costCode'.$i);
$Cgst = $this->input->post('RevenueCgst'.$i); $Cgst = $this->input->post('RevenueCgst'.$i);
$Sgst = $this->input->post('RevenueSgst'.$i); $Sgst = $this->input->post('RevenueSgst'.$i);
@ -380,8 +396,8 @@ class emergencypurchaseorder extends BaseController
$ReqDetQuery = $this->requistion_model->addRequistionDetails($ReqDetails); $ReqDetQuery = $this->requistion_model->addRequistionDetails($ReqDetails);
$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$RegNo,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter); $POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$RegNo,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'Per'=>$per,'ServiceMaterialDescription'=>$revenuedescription);
//print_r($POLineItemList);
$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList); $POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
$LineItemNo = ''; $LineItemNo = '';
@ -395,7 +411,7 @@ class emergencypurchaseorder extends BaseController
{ {
// echo 'Success'; // echo 'Success';
$RevenueTaxList = array('LineItemNo'=>$LineItemNo, 'DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt, 'CGST'=>$Cgst,'AfterCGST'=>$AfterCgst,'SGST'=>$Sgst,'AfterSGST'=>$AfterSgst,'IGST'=>$Igst,'AfterIGST'=>$AfterIgst,'NoOfTrip'=>$NOOfTrip); $RevenueTaxList = array('LineItemNo'=>$LineItemNo, 'DiscountType'=>$DiscountType,'DiscountValue'=>$DiscountValue,'AfterDiscount'=>$AfterDiscount,'PackagingType'=>$PackagingType,'PackagingValue'=>$PackagingValue,'PackagingCalulatedOn'=>$PackagingOption,'AfterPackagingValue'=>$AfterPackagingValue,'FreightType'=>$FreightType, 'FreightValue'=>$FreightValue,'AfterFreightValue'=>$AfterFreightValue,'Insurance'=>$InsuranceValue,'TotalValue'=>$TotalOrderValue, 'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt, 'CGST'=>$Cgst,'AfterCGST'=>$AfterCgst,'SGST'=>$Sgst,'AfterSGST'=>$AfterSgst,'IGST'=>$Igst,'AfterIGST'=>$AfterIgst,'NoOfTrip'=>$NOOfTrip);
//print_r($RevenueTaxList);
$RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList); $RevenueList = $this->purchaseorder_model->addRevenueTax($RevenueTaxList);
//echo 'Revenue tax Success'; //echo 'Revenue tax Success';
} }

121
application/views/alterpurchaseorder.php
View File

@ -99,6 +99,20 @@ if(!empty($INRSYMBOL))
tinymce.init({ tinymce.init({
selector: "textarea#EdittxtSpcialInstructionSingle", //service Edit model description service selector: "textarea#EdittxtSpcialInstructionSingle", //service Edit model description service
menubar: false,
statusbar: false,
toolbar: false
});
tinymce.init({
selector: "textarea#Add_Service_Description", //service Edit model description service
menubar: false,
statusbar: false,
toolbar: false
});
tinymce.init({
selector: "textarea#Edit_Service_Description", //service Edit model description service
menubar: false, menubar: false,
statusbar: false, statusbar: false,
toolbar: false toolbar: false
@ -2529,6 +2543,7 @@ function populateValueMainFormForDeleteItem(rowid)
?> ?>
</div> </div>
@ -3372,6 +3387,14 @@ function populateValueMainFormForDeleteItem(rowid)
?> ?>
</div> </div>
</div> </div>
<label><?php echo "Revenue Description";?></label>
<div class="col-md-4">
<?php
$data = array('name' => 'Edit_Service_Description','value' => set_value('Edit_Service_Description'),'id'=>'Edit_Service_Description', 'class' => 'form-control','rows'=>'2','cols'=>'100');
echo form_textarea($data);;
?>
</div>
<div class="col-md-2"><br/> <div class="col-md-2"><br/>
<a class="btn btn-primary EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit Revenue</span></a> <a class="btn btn-primary EditRevenue" ID="EditRevenue"> &nbsp;&nbsp;<span class="bold">Edit Revenue</span></a>
</div> </div>
@ -3701,6 +3724,14 @@ function populateValueMainFormForDeleteItem(rowid)
?> ?>
</div> </div>
</div> </div>
<label><?php echo "Revenue Description";?></label>
<div class="form-col-md-4">
<?php
$data = array('name' => 'Add_Service_Description','value' => set_value('Add_Service_Description'),'id'=>'Add_Service_Description', 'class' => 'form-control','rows'=>'2','cols'=>'100');
echo form_textarea($data);;
?>
</div>
<div class="col-md-2 "><br/> <div class="col-md-2 "><br/>
<a class="btn btn-primary font AddRevenue" ID="AddRevenue"> &nbsp;&nbsp;<span class="bold">Add Revenue</span></a> <a class="btn btn-primary font AddRevenue" ID="AddRevenue"> &nbsp;&nbsp;<span class="bold">Add Revenue</span></a>
</div> </div>
@ -5257,8 +5288,12 @@ function populateValueMainFormForDeleteItem(rowid)
var userid = ''; var userid = '';
$('.AddRevenue').click(function(){ $('.AddRevenue').click(function(){
tinyMCE.triggerSave();
if(validateRevenueTax() && ExceedBudget($('#txtTotalOrderValue').val(), $('#AvalBuget').val())) var basic = $('#txtBasicValue').val();
var discount = $('#txtAfterDiscount').val();
var finalbasic = basic - discount;
//alert(basic+'-'+discount+'-'+finalbasic);
if(validateRevenueTax() && ExceedBudget(finalbasic, $('#AvalBuget').val()))
{ {
@ -5272,7 +5307,10 @@ function populateValueMainFormForDeleteItem(rowid)
var uom = $("#UOM").val(); var uom = $("#UOM").val();
var quantity = parseFloat($("#Quantity").val()).toFixed(2); var quantity = parseFloat($("#Quantity").val()).toFixed(2);
var itemRate = parseFloat($("#Rate").val()).toFixed(2); var itemRate = parseFloat($("#Rate").val()).toFixed(2);
var PER = $("#addrevenueEmergPer").val()
if(PER == ''){
PER = $("#UOM").val();
}
var DisType = $("#DiscountType").val(); var DisType = $("#DiscountType").val();
var DisVal = $("#txtDiscount").val(); var DisVal = $("#txtDiscount").val();
var AfterDisVal = $("#txtAfterDiscount").val(); var AfterDisVal = $("#txtAfterDiscount").val();
@ -5284,8 +5322,8 @@ function populateValueMainFormForDeleteItem(rowid)
var Cgst = $("#RevenueCgst").val(); var Cgst = $("#RevenueCgst").val();
var AfterCgst = $("#RevenueAfterCgst").val(); var AfterCgst = $("#RevenueAfterCgst").val();
var Sgst = $("#RevenueSgst").val(); var Sgst = $("#RevenueSgst").val();
var AfterSgst = $("#RevenueAfterSgst").val(); var AfterSgst = $("#RevenueAfterSgst").val();
var Igst = $("#RevenueIgst").val(); var Igst = $("#RevenueIgst").val();
@ -5300,6 +5338,7 @@ function populateValueMainFormForDeleteItem(rowid)
var Insval = $("#txtInsurance").val(); var Insval = $("#txtInsurance").val();
var TotalOrderValue = $("#txtTotalOrderValue").val(); var TotalOrderValue = $("#txtTotalOrderValue").val();
var CheckLocalInter = $("input:radio[name='Range']:checked").val(); var CheckLocalInter = $("input:radio[name='Range']:checked").val();
var servicedescription = $("#Add_Service_Description").val();
var TotalTaxValue = calculateRevenueTaxValue(); var TotalTaxValue = calculateRevenueTaxValue();
@ -5332,6 +5371,7 @@ function populateValueMainFormForDeleteItem(rowid)
addHidden(theForm,"uom"+temp,uom); addHidden(theForm,"uom"+temp,uom);
addHidden(theForm,"quantity"+temp,quantity); addHidden(theForm,"quantity"+temp,quantity);
addHidden(theForm,"itemRate"+temp,itemRate); addHidden(theForm,"itemRate"+temp,itemRate);
addHidden(theForm,"per"+temp,PER);
addHidden(theForm,"DisType"+temp,DisType); addHidden(theForm,"DisType"+temp,DisType);
addHidden(theForm,"DisVal"+temp,DisVal); addHidden(theForm,"DisVal"+temp,DisVal);
addHidden(theForm,"AfterDisVal"+temp,AfterDisVal); addHidden(theForm,"AfterDisVal"+temp,AfterDisVal);
@ -5347,7 +5387,7 @@ function populateValueMainFormForDeleteItem(rowid)
addHidden(theForm,"basicval"+temp,basicval); addHidden(theForm,"basicval"+temp,basicval);
addHidden(theForm,"Insval"+temp,Insval); addHidden(theForm,"Insval"+temp,Insval);
addHidden(theForm,"service_description"+temp,servicedescription);
addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue); addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue);
addHidden(theForm,"CheckLocalInter"+temp,CheckLocalInter); addHidden(theForm,"CheckLocalInter"+temp,CheckLocalInter);
addHidden(theForm,"RevenueCgst"+temp,Cgst); addHidden(theForm,"RevenueCgst"+temp,Cgst);
@ -5376,9 +5416,9 @@ function populateValueMainFormForDeleteItem(rowid)
{ {
var Packaging = $('#txtAfterPackaging').val() == '' ? '0.00' : $('#txtAfterPackaging').val(); var Packaging = $('#txtAfterPackaging').val() == '' ? '0.00' : $('#txtAfterPackaging').val();
var Cgst = $('#RevenueCgst').val() == '' ? '0.00' : $('#RevenueCgst').val(); var Cgst = $('#RevenueAfterCgst').val() == '' ? '0.00' : $('#RevenueAfterCgst').val();
var Sgst = $('#RevenueSgst').val() == '' ? '0.00' : $('#RevenueSgst').val(); var Sgst = $('#RevenueAfterSgst').val() == '' ? '0.00' : $('#RevenueAfterSgst').val();
var Igst = $('#RevenueIgst').val() == '' ? '0.00' : $('#RevenueIgst').val(); var Igst = $('#RevenueAfterIgst').val() == '' ? '0.00' : $('#RevenueAfterIgst').val();
var Freight = $('#txtAfterFreight').val() == '' ? '0.00' : $('#txtAfterFreight').val(); var Freight = $('#txtAfterFreight').val() == '' ? '0.00' : $('#txtAfterFreight').val();
var Insurance = $('#txtInsurance').val() == '' ? '0.00' : $('#txtInsurance').val(); var Insurance = $('#txtInsurance').val() == '' ? '0.00' : $('#txtInsurance').val();
@ -5423,6 +5463,7 @@ function populateValueMainFormForDeleteItem(rowid)
$('#UOM').val(''); $('#UOM').val('');
$('#Quantity').val(''); $('#Quantity').val('');
$("#Rate").val(''); $("#Rate").val('');
$("#addrevenueEmergPer").val('');
$("#DiscountType").val('0'); $("#DiscountType").val('0');
$("#txtDiscount").val(''); $("#txtDiscount").val('');
@ -5450,6 +5491,9 @@ function populateValueMainFormForDeleteItem(rowid)
$("#txtBasicValue").val(''); $("#txtBasicValue").val('');
$("#txtInsurance").val(''); $("#txtInsurance").val('');
$("#txtTotalOrderValue").val(''); $("#txtTotalOrderValue").val('');
tinyMCE.get('Add_Service_Description').setContent('');
} }
</script> </script>
<script> <script>
@ -6817,7 +6861,9 @@ $('#SpcialInstruction').val(splinstr);
$('#txtStatus1').val(stat); $('#txtStatus1').val(stat);
var TextRowCount = $('#txtRowCount1').val(); var TextRowCount = $('#txtRowCount1').val();
var TextDeletedRowCount = $('#txtDeletedRow1').val(); var TextDeletedRowCount = $('#txtDeletedRow1').val();
var txtTotalOrderValueSummary = $('#txtTotalOrderValueSummary').val(); var txtTotBasicAmountRevenue = $('#txtTotBasicAmountRevenue').val();
var txtTotalDiscount = $('#txtTotalDiscount').val();
var finalbasicamtrate = txtTotBasicAmountRevenue - txtTotalDiscount;
var TextSpcialInstruction = $('#txtSpcialInstruction').val(); var TextSpcialInstruction = $('#txtSpcialInstruction').val();
var TextStatus = stat; var TextStatus = stat;
var PaymentMethod = $('#PaymentMethod').val(); var PaymentMethod = $('#PaymentMethod').val();
@ -6831,16 +6877,26 @@ $('#SpcialInstruction').val(splinstr);
$('#Deliverydt').focus(); $('#Deliverydt').focus();
return false; return false;
} }
else if(parseInt($('#AvalBuget').val()) < parseInt(txtTotalOrderValueSummary)) { else if(parseInt($('#AvalBuget').val()) < parseInt(finalbasicamtrate)) {
alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
return false;
}
else if($('#insuranceStatus').val() == 'YES' && $('#insuranceNo').val() == '' ) {
alert('Please Enter Insurance Number..!');
return false;
}
else if($('#PaymentMethod').val() == 'PT08' && $('#Otherpayment').val() == '') {
alert('Please Enter Other Payment Description..!');
return false; return false;
} }
else else
{ {
$('#content').loader('show'); $('#content').loader('show');
$.ajax({ $.ajax({
data:$('.CreatealterPO').serialize()+"&TextRowCount="+TextRowCount+"&TextDeletedRowCount="+TextDeletedRowCount+"&txtTotalOrderValueSummary="+txtTotalOrderValueSummary+"&TextStatus="+TextStatus+"&PaymentMethod="+PaymentMethod, data:$('.CreatealterPO').serialize()+"&TextRowCount="+TextRowCount+"&TextDeletedRowCount="+TextDeletedRowCount+"&TextStatus="+TextStatus,
type:"POST", type:"POST",
url:"<?php echo base_url() ?>emergencypurchaseorder/addNewRevenuePurchaseOrder", url:"<?php echo base_url() ?>emergencypurchaseorder/addNewRevenuePurchaseOrder",
success:function(data) { success:function(data) {
@ -7052,7 +7108,8 @@ $('#SpcialInstruction').val(splinstr);
$('#EditRevenueUOM').val($('#uom'+userid).val()); $('#EditRevenueUOM').val($('#uom'+userid).val());
$('#EditRevenueQuantity').val($('#quantity'+userid).val()); $('#EditRevenueQuantity').val($('#quantity'+userid).val());
$('#EditRevenueRate').val($('#itemRate'+userid).val()); $('#EditRevenueRate').val($('#itemRate'+userid).val());
$('#txtEditRevenueBasicValue').val(cellval[6].innerHTML); $('#editrevenueEmergPer').val($('#per'+userid).val());
$('#txtEditRevenueBasicValue').val(cellval[7].innerHTML);
RequistQuantity = $('#quantity'+userid).val(); RequistQuantity = $('#quantity'+userid).val();
$('#txtEditDiscount').val($('#DisVal'+userid).val()); $('#txtEditDiscount').val($('#DisVal'+userid).val());
$('#txtEditAfterDiscount').val($('#AfterDisVal'+userid).val()); $('#txtEditAfterDiscount').val($('#AfterDisVal'+userid).val());
@ -7082,7 +7139,7 @@ $('#SpcialInstruction').val(splinstr);
$('#RevenueEditSgst').val($('#RevenueSgst'+userid).val()); $('#RevenueEditSgst').val($('#RevenueSgst'+userid).val());
$('#RevenueEditIgst').val($('#RevenueIgst'+userid).val()); $('#RevenueEditIgst').val($('#RevenueIgst'+userid).val());
$('#txtEditRevenueTotalOrderValue').val($('#TotalOrderValue'+userid).val()); $('#txtEditRevenueTotalOrderValue').val($('#TotalOrderValue'+userid).val());
tinyMCE.get('Edit_Service_Description').setContent($('#service_description'+userid).val());
@ -7133,7 +7190,7 @@ $('#SpcialInstruction').val(splinstr);
}); });
$('.EditRevenue').click(function(){ $('.EditRevenue').click(function(){
tinyMCE.triggerSave();
if(validateEditRevenueTax() && validateEditExceedLimit()) if(validateEditRevenueTax() && validateEditExceedLimit())
{ {
//alert('inside Add'); //alert('inside Add');
@ -7145,7 +7202,11 @@ $('.EditRevenue').click(function(){
var editQuantity = $('#EditRevenueQuantity').val(); var editQuantity = $('#EditRevenueQuantity').val();
var itemRate = $("#EditRevenueRate").val(); var itemRate = $("#EditRevenueRate").val();
var PER = $("#editrevenueEmergPer").val();
if(PER == '')
{
PER = $('#EditRevenueUOM').val();
}
var DisType = $("#EditDiscountType").val(); var DisType = $("#EditDiscountType").val();
var DisVal = $("#txtEditDiscount").val(); var DisVal = $("#txtEditDiscount").val();
@ -7171,7 +7232,7 @@ $('.EditRevenue').click(function(){
var Igst = $("#RevenueEditIgst").val(); var Igst = $("#RevenueEditIgst").val();
var AfterIgst = $("#RevenueEditAfterIgst").val(); var AfterIgst = $("#RevenueEditAfterIgst").val();
var TotalOrderValue = $("#txtEditRevenueTotalOrderValue").val(); var TotalOrderValue = $("#txtEditRevenueTotalOrderValue").val();
var servicedescription = $("#Edit_Service_Description").val();
var TotalTaxValue = calculateRevenueEditTaxValue(); var TotalTaxValue = calculateRevenueEditTaxValue();
@ -7179,12 +7240,12 @@ $('.EditRevenue').click(function(){
var cellval = tr.cells; var cellval = tr.cells;
cellval[3].innerHTML = editMaterialCode; cellval[3].innerHTML = editMaterialCode;
cellval[3].innerHTML = editDescription; cellval[3].innerHTML = editDescription;
cellval[4].innerHTML = editQuantity; cellval[4].innerHTML = parseFloat(editQuantity).toFixed(2);
cellval[5].innerHTML =editUOM; cellval[5].innerHTML =editUOM;
cellval[6].innerHTML =itemRate; cellval[6].innerHTML =parseFloat(itemRate).toFixed(2);
cellval[7].innerHTML =basicval; cellval[7].innerHTML =parseFloat(basicval).toFixed(2);
cellval[8].innerHTML =TotalTaxValue; cellval[8].innerHTML =parseFloat(TotalTaxValue).toFixed(2);
cellval[9].innerHTML =TotalOrderValue; cellval[9].innerHTML =parseFloat(TotalOrderValue).toFixed(2);
$('#materialCode'+userid).val(editMaterialCode); $('#materialCode'+userid).val(editMaterialCode);
@ -7192,6 +7253,7 @@ $('.EditRevenue').click(function(){
$('#uom'+userid).val(editUOM); $('#uom'+userid).val(editUOM);
$('#quantity'+userid).val(editQuantity); $('#quantity'+userid).val(editQuantity);
$('#itemRate'+userid).val(itemRate); $('#itemRate'+userid).val(itemRate);
$('#per'+userid).val(PER);
$('#DisType'+userid).val(DisType); $('#DisType'+userid).val(DisType);
$('#DisVal'+userid).val(DisVal); $('#DisVal'+userid).val(DisVal);
$('#AfterDisVal'+userid).val(AfterDisVal); $('#AfterDisVal'+userid).val(AfterDisVal);
@ -7213,7 +7275,7 @@ $('.EditRevenue').click(function(){
$('#RevenueIgst'+userid).val(Igst); $('#RevenueIgst'+userid).val(Igst);
$('#RevenueAfterIgst'+userid).val(AfterIgst); $('#RevenueAfterIgst'+userid).val(AfterIgst);
$('#service_description'+userid).val(servicedescription);
$('#TotalOrderValue'+userid).val(TotalOrderValue); $('#TotalOrderValue'+userid).val(TotalOrderValue);
populateValueMainFormForEditRevenueTax(); populateValueMainFormForEditRevenueTax();
} }
@ -7266,9 +7328,10 @@ $('.EditRevenue').click(function(){
{ {
var avalbudAmt = parseFloat($('#EditRevenueAvlBudAmt').val()); var avalbudAmt = parseFloat($('#EditRevenueAvlBudAmt').val());
var basicAmountRate = parseFloat($('#txtEditRevenueBasicValue').val()); var basicAmountRate = parseFloat($('#txtEditRevenueBasicValue').val());
var totalAmount = parseFloat($('#txtEditRevenueTotalOrderValue').val()); var discount = parseFloat($('#txtEditAfterDiscount').val());
var finalbasicamtrate = basicAmountRate - discount
if(basicAmountRate > avalbudAmt || totalAmount > avalbudAmt) if(finalbasicamtrate > avalbudAmt) //|| totalAmount > avalbudAmt)
{ {
alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.'); alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.');
$('#EditRevenueRate').focus(); $('#EditRevenueRate').focus();
@ -7315,6 +7378,7 @@ $('.EditRevenue').click(function(){
var Insurance = $('#Insval'+rowid).val() == '' ? '0.00' : $('#Insval'+rowid).val(); var Insurance = $('#Insval'+rowid).val() == '' ? '0.00' : $('#Insval'+rowid).val();
var Discount =$('#AfterDisVal'+rowid).val() == '' ? '0.00' : $('#AfterDisVal'+rowid).val(); var Discount =$('#AfterDisVal'+rowid).val() == '' ? '0.00' : $('#AfterDisVal'+rowid).val();
var BasicVal = $('#basicval'+rowid).val() == '' ? '0.00' : $('#basicval'+rowid).val(); var BasicVal = $('#basicval'+rowid).val() == '' ? '0.00' : $('#basicval'+rowid).val();
//alert('FROM LINE'+BasicVal);
var Cgst = $('#RevenueAfterCgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterCgst'+rowid).val(); var Cgst = $('#RevenueAfterCgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterCgst'+rowid).val();
var Sgst = $('#RevenueAfterSgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterSgst'+rowid).val(); var Sgst = $('#RevenueAfterSgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterSgst'+rowid).val();
var Igst = $('#RevenueAfterIgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterIgst'+rowid).val(); var Igst = $('#RevenueAfterIgst'+rowid).val() == '' ? '0.00' : $('#RevenueAfterIgst'+rowid).val();
@ -7323,6 +7387,7 @@ $('.EditRevenue').click(function(){
totBasicAmt = parseFloat(totBasicAmt ) + parseFloat(BasicVal); totBasicAmt = parseFloat(totBasicAmt ) + parseFloat(BasicVal);
//alert('TOTAL ADD'+totBasicAmt);
totDiscountAmt = parseFloat(totDiscountAmt ) + parseFloat(Discount); totDiscountAmt = parseFloat(totDiscountAmt ) + parseFloat(Discount);
totPackagingAmt = parseFloat(totPackagingAmt) + parseFloat(Packaging); totPackagingAmt = parseFloat(totPackagingAmt) + parseFloat(Packaging);
@ -7337,7 +7402,7 @@ $('.EditRevenue').click(function(){
} while (i < rows); } while (i < rows);
$('#txtTotBasicAmount').val(parseFloat(totBasicAmt).toFixed(2) ); $('#txtTotBasicAmountRevenue').val(parseFloat(totBasicAmt).toFixed(2) );
$('#txtTotalDiscount').val(parseFloat(totDiscountAmt).toFixed(2) ); $('#txtTotalDiscount').val(parseFloat(totDiscountAmt).toFixed(2) );
$('#txtTotalPackaing').val(parseFloat(totPackagingAmt).toFixed(2) ); $('#txtTotalPackaing').val(parseFloat(totPackagingAmt).toFixed(2) );
@ -7445,7 +7510,7 @@ function calculateRevenueTaxValue()
var totvalue = parseFloat(Packaging) + parseFloat(Cgst) + parseFloat(Sgst)+ parseFloat(Igst) + parseFloat(Freight) + parseFloat(Insurance) ; var totvalue = parseFloat(Cgst) + parseFloat(Sgst)+ parseFloat(Igst);
var tot = parseFloat(totvalue).toFixed(2); var tot = parseFloat(totvalue).toFixed(2);
@ -7464,7 +7529,7 @@ function calculateRevenueEditTaxValue()
var totvalue = parseFloat(Packaging) + parseFloat(Cgst) + parseFloat(Sgst)+ parseFloat(Igst) + parseFloat(Freight) + parseFloat(Insurance) ; var totvalue = parseFloat(Cgst) + parseFloat(Sgst)+ parseFloat(Igst);
var tot = parseFloat(totvalue).toFixed(2); var tot = parseFloat(totvalue).toFixed(2);

191
application/views/editRevenueAmendPO.php
View File

@ -57,6 +57,14 @@ foreach ($PaymentTerms as $TER)
$PaymentOtherDescription=''; $PaymentOtherDescription='';
$ServiceDescription = ''; $ServiceDescription = '';
$taxrange=""; $taxrange="";
$modeofshipment='';
$supplierref='';
$suppofferno='';
$otherref='';
$fincap='';
$revenuesubtype='';
$insurencestatus='';
$insurenceno='';
if(!empty($POMaster)) if(!empty($POMaster))
{ {
@ -84,9 +92,17 @@ if(!empty($POMaster))
$DeliveryAddress =$Req->DeliveryAddress; $DeliveryAddress =$Req->DeliveryAddress;
$POStatus = $Req->StatusName; $POStatus = $Req->StatusName;
$PONO = $Req->PONO; $PONO = $Req->PONO;
$taxrange=$Req->CapitalRange; $taxrange=$Req->PORange;
//echo $taxrange . "t"; //echo $taxrange . "t";
$ServiceDescription = $Req->ServiceDescription; $ServiceDescription = $Req->ServiceDescription;
$modeofshipment = $Req->Mode_Of_Shipment;
$supplierref = $Req->Supplier_Reference;
$suppofferno = $Req->Supplier_Offer_No;
$otherref = $Req->Other_Reference;
$fincap = $Req->Fincap;
$revenuesubtype = $Req->POSubType;
$insurencestatus = $Req->InsuranceStatus;
$insurenceno = $Req->InsuranceNumber;
} }
} }
@ -144,6 +160,14 @@ foreach ($POSTATUS as $PST )
toolbar: false, toolbar: false,
//plugins: "link image" //plugins: "link image"
}); });
tinymce.init({
selector: "textarea#Edit_Service_Description",
menubar: false,
statusbar: false,
toolbar: false,
//plugins: "link image"
});
</script> </script>
<script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script> <script src="<?php echo base_url(); ?>assets/js/CreatePOValidation.js" type="text/javascript"></script>
@ -154,7 +178,18 @@ foreach ($POSTATUS as $PST )
var others ='<?php echo $PaymentOtherDescription;?>'; var others ='<?php echo $PaymentOtherDescription;?>';
var DelDt = '<?php echo $Deliverydt; ?>'; var DelDt = '<?php echo $Deliverydt; ?>';
var insurancestatus = '<?php echo $insurencestatus;?>';
var insuranceno = '<?php echo $insurenceno;?>';
$(document).ready(function () { $(document).ready(function () {
$('#RequistionNo').attr("style", "pointer-events: none;");
$('#drpSupplier').attr("style", "pointer-events: none;");
$('#PoTypeOptions').attr("style", "pointer-events: none;");
$('#insurancestatus').attr("style", "pointer-events: none;");
$('#insuranceno').attr("style", "pointer-events: none;");
if(DelOpt=="0"){ if(DelOpt=="0"){
$('#Deliverydtdiv').show(); $('#Deliverydtdiv').show();
$('#Schedulediv').hide(); $('#Schedulediv').hide();
@ -178,6 +213,22 @@ $('#Otherpayment').val(others);
} }
if(insurancestatus == 1)
{
$('#insurancestatus').val(insurancestatus);
$("#insurancenodiv").show();
$('#insuranceno').val(insuranceno);
}
else
{
$('#insurancestatus').val(insurancestatus);
$('#insuranceno').val("");
$("#insurancenodiv").hide();
}
}); });
</script> </script>
<script> <script>
@ -742,9 +793,11 @@ function validateEditExceedLimit()
{ {
var avalbudAmt = parseFloat($('#EditAvlBudAmt').val()); var avalbudAmt = parseFloat($('#EditAvlBudAmt').val());
var basicAmountRate = parseFloat($('#txtEditBasicValue').val()); var basicAmountRate = parseFloat($('#txtEditBasicValue').val());
var totalAmount = parseFloat($('#txtEditTotalOrderValue').val()); //alert(basicAmountRate);
var discount = parseFloat($('#txtEditAfterDiscount').val());
if(basicAmountRate > avalbudAmt || totalAmount > avalbudAmt) basicAmountRate = basicAmountRate - discount;
//alert(basicAmountRate+'-'+avalbudAmt+'-'+discount);
if(basicAmountRate > avalbudAmt)// || totalAmount > avalbudAmt)
{ {
alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.'); alert('Basic amount is exceeding the Budget Limit.Please adjust the product value.');
$('#EditRate').focus(); $('#EditRate').focus();
@ -790,7 +843,7 @@ function calculateEditTaxValue()
var Discount = $('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val(); var Discount = $('#txtEditAfterDiscount').val() == '' ? '0.00' : $('#txtEditAfterDiscount').val();
var totvalue = parseFloat(Packaging)+ parseFloat(Vat) + parseFloat(GST) + parseFloat(OtherTax) + parseFloat(Freight) + parseFloat(Insurance) ; var totvalue = parseFloat(Vat) + parseFloat(GST) + parseFloat(OtherTax) ;//VAT => SGST,GST => CGST, OtherTax => IGST
var tot = parseFloat(totvalue).toFixed(2); var tot = parseFloat(totvalue).toFixed(2);
//alert('tot:'+tot); //alert('tot:'+tot);
@ -872,7 +925,7 @@ function calculateEditTaxValue()
<label>Purchase Order Date</label> <label>Purchase Order Date</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'PODate','value' => set_value('PODate',$PODate),'id'=>'PODate', 'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;'); $data = array('name' => 'PODate','value' => set_value('PODate',$PODate),'id'=>'PODate', 'class' => 'form-control num' ,'required' => 'true','onkeypress'=>'return false;','readonly'=>'true');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -896,7 +949,7 @@ function calculateEditTaxValue()
endforeach; endforeach;
} }
echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId),'id="drpSupplier"' ,'required="true"' ,'class="form-control select2','disabled=disabled'); echo form_dropdown('drpSupplier', $options,set_value('drpSupplier',$SupId),'id="drpSupplier"' ,'required="true"' ,'class="form-control select2','disabled=disabled','readonly=readonly');
?> ?>
</div> </div>
@ -955,7 +1008,7 @@ function calculateEditTaxValue()
<label>Delivery Address</label> <label>Delivery Address</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'DeliveryAddr','value' => set_value('DeliveryAddr',$DeliveryAddress),'id'=>'DeliveryAddr', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40'); $data = array('name' => 'DeliveryAddr','value' => set_value('DeliveryAddr',$DeliveryAddress),'id'=>'DeliveryAddr', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40','readonly' => 'true');
echo Form_textarea($data); echo Form_textarea($data);
?> <input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" value="<?php echo $DeliveryAddress;?>"> ?> <input type="hidden" name="txtDeliveryAddress" id="txtDeliveryAddress" value="<?php echo $DeliveryAddress;?>">
</div> </div>
@ -999,7 +1052,7 @@ function calculateEditTaxValue()
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'addmodeofshipment','value' => set_value('addmodeofshipment'),'id'=>'addmodeofshipment', 'class' => 'form-control'); $data = array('name' => 'addmodeofshipment','value' => set_value('addmodeofshipment',$modeofshipment),'id'=>'addmodeofshipment', 'class' => 'form-control','readonly' => 'readonly');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -1015,7 +1068,7 @@ function calculateEditTaxValue()
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'amendsupplierreference','value' => set_value('amendsupplierreference'),'id'=>'amendsupplierreference', 'class' => 'form-control'); $data = array('name' => 'amendsupplierreference','value' => set_value('amendsupplierreference',$supplierref),'id'=>'amendsupplierreference', 'class' => 'form-control','readonly' => 'readonly');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -1031,7 +1084,7 @@ function calculateEditTaxValue()
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'amendsupplierofferno','value' => set_value('amendsupplierofferno'),'id'=>'amendsupplierofferno', 'class' => 'form-control'); $data = array('name' => 'amendsupplierofferno','value' => set_value('amendsupplierofferno',$suppofferno),'id'=>'amendsupplierofferno', 'class' => 'form-control','readonly' => 'readonly');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -1045,7 +1098,7 @@ function calculateEditTaxValue()
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'amendotherreference','value' => set_value('amendotherreference'),'id'=>'amendotherreference', 'class' => 'form-control'); $data = array('name' => 'amendotherreference','value' => set_value('amendotherreference',$otherref),'id'=>'amendotherreference', 'class' => 'form-control','readonly' => 'readonly');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -1055,7 +1108,7 @@ function calculateEditTaxValue()
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'amendfincap','value' => set_value('amendfincap'),'id'=>'amendfincap', 'class' => 'form-control'); $data = array('name' => 'amendfincap','value' => set_value('amendfincap',$fincap),'id'=>'amendfincap', 'class' => 'form-control','readonly' => 'readonly');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>
@ -1064,6 +1117,60 @@ function calculateEditTaxValue()
</div> </div>
</div> </div>
</div><!--End new fields 1 sep--> </div><!--End new fields 1 sep-->
<div class="row">
<div class="col-md-12">
<div class="col-md-3">
<div class="col-md-12" style="padding: 0px;">
<label>Revenue Type Options</label>
<div class="form-group">
<?php
//$optionsWork = array("0"=>'Select Work Status');
if(!empty($PoTypeOptions))
{
foreach ($PoTypeOptions as $POpt):
$optionsPO[$POpt->ConfigValue] = $POpt->ConfigValue;
endforeach;
}
echo form_dropdown('PoTypeOptions', $optionsPO,$revenuesubtype,set_value('PoTypeOptions'),'id="PoTypeOptions"' ,'required="true"' ,'class="form-control');
?>
</div>
</div>
</div>
<div class="col-md-1">
<label for="insurance">Insurance</label>
<?php
$optionsnew=array('1'=>'Yes','0'=>'No');
echo form_dropdown('insurancestatus', $optionsnew,set_value('insurancestatus'),'id="insurancestatus"' ,'required="true"' ,'class="form-control select2', 'readonly ="true"');
?>
</div>
<div class="col-md-3" id="insurancenodiv" style="display:block;">
<label>Insurance No<span class="badge" style="color:red;text-align:right;background-color: #ecf0f5 ;">*</span></label>
<div class="form-group">
<?php
$data = array('name' => 'insuranceno','insuranceno' => set_value('insuranceno',$insurenceno),'id'=>'insuranceno', 'class' => 'form-control' ,'required' => 'true');
echo form_input($data);
?>
</div>
</div>
</div>
</div>
<div class="col-md-12" style="padding:0px;"> <div class="col-md-12" style="padding:0px;">
<div class="col-md-3"> <div class="col-md-3">
@ -1605,6 +1712,15 @@ function calculateEditTaxValue()
?> ?>
</div> </div>
</div> </div>
<label><?php echo "Revenue Description";?></label>
<div class="form-group">
<?php
$data = array('name' => 'Edit_Service_Description','value' => set_value('Edit_Service_Description'),'id'=>'Edit_Service_Description', 'class' => 'form-control','rows'=>'2','cols'=>'100');
echo form_textarea($data);;
?>
</div>
</div> </div>
</div><hr/> </div><hr/>
<div class="row"> <div class="row">
@ -1678,6 +1794,8 @@ function calculateEditTaxValue()
<input type="hidden" name="<?php echo 'quantity'.$index ?>" id="<?php echo 'quantity'.$index ?>" value="<?php echo $record->Quantity ; ?>" /> <input type="hidden" name="<?php echo 'quantity'.$index ?>" id="<?php echo 'quantity'.$index ?>" value="<?php echo $record->Quantity ; ?>" />
<input type="hidden" name="<?php echo 'itemRate'.$index ?>" id="<?php echo 'itemRate'.$index ?>" value="<?php echo $record->Rate ; ?>" /> <input type="hidden" name="<?php echo 'itemRate'.$index ?>" id="<?php echo 'itemRate'.$index ?>" value="<?php echo $record->Rate ; ?>" />
<input type="hidden" name="<?php echo 'per'.$index ?>" id="<?php echo 'per'.$index ?>" value="<?php echo $record->Per ; ?>" />
<input type="hidden" name="<?php echo 'service_description'.$index ?>" id="<?php echo 'service_description'.$index ?>" value="<?php echo $record->ServiceMaterialDescription ; ?>" />
<input type="hidden" name="<?php echo 'DisType'.$index ?>" id="<?php echo 'DisType'.$index ?>" value="<?php echo $record->DiscountType ; ?>" /> <input type="hidden" name="<?php echo 'DisType'.$index ?>" id="<?php echo 'DisType'.$index ?>" value="<?php echo $record->DiscountType ; ?>" />
<input type="hidden" name="<?php echo 'beforeDisType'.$index ?>" id="<?php echo 'beforeDisType'.$index ?>" value="<?php echo $record->DiscountType ; ?>" /> <input type="hidden" name="<?php echo 'beforeDisType'.$index ?>" id="<?php echo 'beforeDisType'.$index ?>" value="<?php echo $record->DiscountType ; ?>" />
@ -1764,7 +1882,7 @@ function calculateEditTaxValue()
<label >Basic Amount In INR </label> <label >Basic Amount In INR </label>
<?php <?php
$data = array('name' => 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount',$totBasicAmt),'id'=>'txtTotBasicAmount', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); $data = array('name' => 'txtTotBasicAmount','value' => set_value('txtTotBasicAmount',number_format($totBasicAmt,2,'.','')),'id'=>'txtTotBasicAmount', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
@ -1774,7 +1892,7 @@ function calculateEditTaxValue()
<label >Total Discount Amount In INR </label> <label >Total Discount Amount In INR </label>
<?php <?php
$data = array('name' => 'txtTotalDiscount','value' => set_value('txtTotalDiscount',$totDiscountAmt),'id'=>'txtTotalDiscount', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); $data = array('name' => 'txtTotalDiscount','value' => set_value('txtTotalDiscount',number_format($totDiscountAmt,2,'.','')),'id'=>'txtTotalDiscount', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
@ -1783,7 +1901,7 @@ function calculateEditTaxValue()
<label >Total SGST Amount In INR </label> <label >Total SGST Amount In INR </label>
<?php <?php
$data = array('name' => 'txtTotalVat','value' => set_value('txtTotalVat',$totVATAmt),'id'=>'txtTotalVat', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); $data = array('name' => 'txtTotalVat','value' => set_value('txtTotalVat',number_format($totVATAmt,2,'.','')),'id'=>'txtTotalVat', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
@ -1792,7 +1910,7 @@ function calculateEditTaxValue()
<label >Total IGST Amount In INR </label> <label >Total IGST Amount In INR </label>
<?php <?php
$data = array('name' => 'txtTotalOtherTaxes','value' => set_value('txtTotalOtherTaxes',$totOtherTaxAmt),'id'=>'txtTotalOtherTaxes', 'class' => 'form-control num','readonly' => 'true','style'=>'text-align:right;'); $data = array('name' => 'txtTotalOtherTaxes','value' => set_value('txtTotalOtherTaxes',number_format($totOtherTaxAmt,2,'.','')),'id'=>'txtTotalOtherTaxes', 'class' => 'form-control num','readonly' => 'true','style'=>'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
@ -1801,7 +1919,7 @@ function calculateEditTaxValue()
<label >Total CGST Amount In INR </label> <label >Total CGST Amount In INR </label>
<?php <?php
$data = array('name' => 'txtTotalGST','value' => set_value('txtTotalGST',$totGSTAmt),'id'=>'txtTotalGST','readonly' => 'true', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>' calculateGST(0);'); $data = array('name' => 'txtTotalGST','value' => set_value('txtTotalGST',number_format($totGSTAmt,2,'.','')),'id'=>'txtTotalGST','readonly' => 'true', 'class' => 'form-control num' ,'onkeypress'=>'return isNumberKey(event);','onchange'=>' calculateGST(0);');
echo form_input($data); echo form_input($data);
?> ?>
@ -1815,7 +1933,7 @@ function calculateEditTaxValue()
<label >Total Packaging Amount In INR </label> <label >Total Packaging Amount In INR </label>
<?php <?php
$data = array('name' => 'txtTotalPackaing','value' => set_value('txtTotalPackaing',$totPackagingAmt),'id'=>'txtTotalPackaing', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;'); $data = array('name' => 'txtTotalPackaing','value' => set_value('txtTotalPackaing',number_format($totPackagingAmt,2,'.','')),'id'=>'txtTotalPackaing', 'class' => 'form-control num' ,'readonly' => 'true','style'=>'text-align:right;');
echo form_input($data); echo form_input($data);
?> ?>
@ -1937,8 +2055,8 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
$('#EditItemName').val($('#materialName'+userid).val()); $('#EditItemName').val($('#materialName'+userid).val());
$('#EditUOM').val($('#uom'+userid).val()); $('#EditUOM').val($('#uom'+userid).val());
$('#EditQuantity').val($('#quantity'+userid).val()); $('#EditQuantity').val($('#quantity'+userid).val());
$('#EditAmendPer').val($('#per'+userid).val());
tinyMCE.get('Edit_Service_Description').setContent($('#service_description'+userid).val());
$('#EditRate').val($('#itemRate'+userid).val()); $('#EditRate').val($('#itemRate'+userid).val());
@ -2033,7 +2151,8 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
$('.editrevenue').click(function(){ $('.editrevenue').click(function(){
//alert('inside Functioon'); //alert('inside Functioon');
tinyMCE.triggerSave();
if(validateEditRevenueTax() && validateEditExceedLimit()) if(validateEditRevenueTax() && validateEditExceedLimit())
{ {
// alert('inside IF'); // alert('inside IF');
@ -2045,7 +2164,11 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
var editQuantity = $('#EditQuantity').val(); var editQuantity = $('#EditQuantity').val();
var itemRate = $("#EditRate").val(); var itemRate = $("#EditRate").val();
var per = $("#EditAmendPer").val();
if(per == '')
{
per = $('#EditUOM').val();
}
var DisType = $("#EditDiscountType").val(); var DisType = $("#EditDiscountType").val();
var DisVal = $("#txtEditDiscount").val(); var DisVal = $("#txtEditDiscount").val();
@ -2082,7 +2205,7 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
var basicval = $("#txtEditBasicValue").val(); var basicval = $("#txtEditBasicValue").val();
var Insval = $("#txtEditInsurance").val(); var Insval = $("#txtEditInsurance").val();
var TotalOrderValue = $("#txtEditTotalOrderValue").val(); var TotalOrderValue = $("#txtEditTotalOrderValue").val();
var Service_Description=$("#Edit_Service_Description").val();
var TotalTaxValue = calculateEditTaxValue(); var TotalTaxValue = calculateEditTaxValue();
//alert(TotalTaxValue); //alert(TotalTaxValue);
@ -2136,7 +2259,7 @@ $("#EDITREVENUE").on("shown.bs.modal", function(e) {
$('#AvilBudget'+userid).val(AvilBudget); $('#AvilBudget'+userid).val(AvilBudget);
$('#costCode'+userid).val(CostCode); $('#costCode'+userid).val(CostCode);
$('#TotalOrderValue'+userid).val(TotalOrderValue); $('#TotalOrderValue'+userid).val(TotalOrderValue);
$('#service_description'+userid).val(Service_Description);
populateValueMainFormForEditRevenueTax(); populateValueMainFormForEditRevenueTax();
} }
@ -2355,7 +2478,8 @@ var splinstr = $('#txtSpcialInstruction').val();
$('#SpcialInstruction').val(splinstr); $('#SpcialInstruction').val(splinstr);
$('#txtDeliveryAddress').val(deladd); $('#txtDeliveryAddress').val(deladd);
var AvlBudAmt = '<?php echo number_format($AvlAmount+$totBasicAmt-$totDiscountAmt, 2, '.', '') ?>'; var AvlBudAmt = '<?php echo number_format($AvlAmount+$totBasicAmt-$totDiscountAmt, 2, '.', '') ?>';
var txtTotalOrderValueSummary = $('#txtTotalOrderValueSummary').val(); var txtTotBasicAmount = $('#txtTotBasicAmount').val();
var txtTotalDiscount = $('#txtTotalDiscount').val();
//alert('Before Validate IF condition'); //alert('Before Validate IF condition');
if(validate()) if(validate())
{ {
@ -2368,7 +2492,7 @@ var txtTotalOrderValueSummary = $('#txtTotalOrderValueSummary').val();
$('#Deliverydt').focus(); $('#Deliverydt').focus();
return false; return false;
} }
else if(parseInt(AvlBudAmt) < parseInt(txtTotalOrderValueSummary)) { else if(parseInt(AvlBudAmt) < (parseInt(txtTotBasicAmount) - parseInt(txtTotalDiscount))) {
alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.'); alert('Total Order Amount is exceeding the Budget Limit.Please adjust the product value.');
return false; return false;
@ -2444,4 +2568,17 @@ $("#PaymentTerms").change(function() {
$('#otheroptiondiv').hide(); $('#otheroptiondiv').hide();
} }
}); });
</script>
<script>
$('#insurancestatus').change(function(){
var ans=$("#insurancestatus").val();
//alert(ans);
if(ans == 0){
$("#insurancenodiv").hide();
//$("#insuranceno").val("");
}
else {
$("#insurancenodiv").show();}
});
</script> </script>