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

service po

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2017-07-03 13:29:42 +05:30
parent fc1ec4b5d9
commit ec769533ca
5 changed files with 79 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/controllers/purchaseorder.php
View File

@ -329,6 +329,7 @@ class purchaseorder extends BaseController
$data['POItem'] = $this->purchaseorder_model->GetServicePurchaseOrderDetails($PONO);
$data['PaymentTerms']=$this->purchaseorder_model->GetPaymentTerms($PONO);
//$data['WorkStatus']=$this->purchaseorder_model->GetWorkStatus('C019');
$data['WorkStatus']=$this->purchaseorder_model->GetWorkStatus('C019');
$this->global['pageTitle'] = 'Siddharth : Edit Service Purchase order form';
$this->loadViews("EditservicePurchaseorder", $this->global, $data, NULL);

41
application/controllers/servicepurchaseorder.php
View File

@ -71,19 +71,20 @@ class servicepurchaseorder extends BaseController
$DeliveryAddr = $this->input->post('DeliveryAddr');
$dt = $this->input->post('Deliverydt');
//$Deliverydt = $this->getDateformat($dt);
$DeliveryOption = $this->input->post('DateRange');
if($DeliveryOption==1){
$Deliverydt = '';
$DeliverySchedule = $this->input->post('Scheduleby');
}
else{
$Deliverydt = $this->getDateformat($dt);
$DeliverySchedule = '';
}
$DeliveryOption = $this->input->post('DateRange');
if($DeliveryOption==1)
{
$Deliverydt = '';
$DeliverySchedule = $this->input->post('Scheduleby');
}
else{
$Deliverydt = $this->getDateformat($dt);
$DeliverySchedule = '';
}
$PaymentDate=$this->input->post('Payment');
$PaymentDate=$this->input->post('Payment');
if($PaymentDate==1)
{
$PaymentDays='After';
@ -110,9 +111,12 @@ class servicepurchaseorder extends BaseController
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$createddt = $dt->format('Y-m-d H:i:s');
$WorkStatus=$this->input->post('workstatus');
// PO Master
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus, 'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption, 'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'PayableAT'=>$Payableat,'PaymentDays'=>$PaymentDays );
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus, 'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption, 'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'CreatedDate'=>$createddt,'PaymentTerms'=>$PaymentTerms,'PayableAT'=>$Payableat,'PaymentDays'=>$PaymentDays,'ServiceWorkStatus'=>$WorkStatus );
//print_r($POList);
//die();
$POMaster = $this->purchaseorder_model->addPOMaster($POList);
$PONO = '';
@ -137,6 +141,7 @@ class servicepurchaseorder extends BaseController
$KrishiTax = $this->input->post('KrishiTax'.$i);
$SwachhTax = $this->input->post('SwachhTax'.$i);
$CostCenter = $this->input->post('costCode'.$i);
$ServiceFrequency=$this->input->post('Frequency'.$i);
$TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
@ -158,7 +163,9 @@ class servicepurchaseorder extends BaseController
if($SkipInsert == "False")
{
$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter);
$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$CreateBy,'CreatedDate'=>$createddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency);
print_r($POLineItemList);
die();
$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
@ -231,10 +238,11 @@ class servicepurchaseorder extends BaseController
$comma_separated = explode(':', $DeletedRow);
$dt = new DateTime('now', new DateTimeZone('Asia/Kolkata'));
$updateddt = $dt->format('Y-m-d H:i:s');
$WorkStatus=$this->input->post('workstatus');
// PO Master
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpcialInstruction,'UpdateBY'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'PayableAT'=>$Payableat,'PaymentDays'=>$PaymentDays );
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrderValueSummary,'PODate'=>$PODate,'Status'=>$POStatus,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ServiceDescription'=>$SpcialInstruction,'UpdateBY'=>$updatedBy,'DeliveryAddress'=>$DeliveryAddr,'DeliveryDate'=>$Deliverydt,'UpdatedOn'=>$updateddt,'PaymentTerms'=>$PaymentTerms,'PayableAT'=>$Payableat,'PaymentDays'=>$PaymentDays,'ServiceWorkStatus'=>$WorkStatus );
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList);
@ -253,7 +261,8 @@ class servicepurchaseorder extends BaseController
$SwachhTax = $this->input->post('SwachhTax'.$i);
$CostCenter = $this->input->post('costCode'.$i);
$POLineItemNo = $this->input->post('LineItemNo'.$i);
$TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
$TotalOrderValue = $this->input->post('TotalOrderValue'.$i);
$ServiceFrequency=$this->input->post('Frequency'.$i);
$POLineItem = array();
$LineItemNo = '';
@ -276,7 +285,7 @@ class servicepurchaseorder extends BaseController
{
if(strlen($POLineItemNo) == 0)
{
$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CostCenterCode'=>$CostCenter);
$POLineItemList = array('PONO'=>$PONO, 'ReqNo'=>$Reqnumber,'MaterialCode'=>$MaterialCode,'Quantity'=>$Quantity,'Rate'=>$itemRate,'Status'=>$LineItemStatus,'CreatedBy'=>$updatedBy,'CreatedDate'=>$updateddt,'CostCenterCode'=>$CostCenter,'ServiceFrequency'=>$ServiceFrequency);
$POLineItem = $this->purchaseorder_model->addPOLineItem($POLineItemList);
if(count($POLineItem)>0)
{

4
application/models/purchaseorder_model.php
View File

@ -446,7 +446,7 @@ function purchaseorderListing($forwhat='')
function GetServicePurchaseOrder($PONO = '')
{
$this->db->distinct();
$this->db->select('ReqNo,POMast.PONO,ServiceDescription,supp.SupplierID,supp.SupplierName,supp.Address,PODate,Stat.StatusName,DeliveryOption,DeliverySchedule,DeliveryDate,DeliveryAddress,POMast.PaymentTerms,POMast.PaymentDays,POMast.PayableAT,POMast.ExchangeRate,POMast.UpdatedOn,Stat.StatusCode');
$this->db->select('ReqNo,POMast.PONO,ServiceDescription,supp.SupplierID,supp.SupplierName,supp.Address,PODate,Stat.StatusName,DeliveryOption,DeliverySchedule,DeliveryDate,DeliveryAddress,POMast.PaymentTerms,POMast.PaymentDays,POMast.PayableAT,POMast.ExchangeRate,POMast.UpdatedOn,Stat.StatusCode,POMast.ServiceWorkStatus');
$this->db->from('T_PurchaseOrder_Master POMast');
$this->db->join('T_SupplierDetailsN supp', 'supp.SupplierID = POMast.SupplierID');
$this->db->join('T_Status Stat', 'Stat.StatusCode = POMast.Status');
@ -465,7 +465,7 @@ function purchaseorderListing($forwhat='')
{
$subQuery ='SELECT distinct LineItem.LineItemNo,ReqNo,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,Quantity,Rate,Status,ROUND((Quantity *Rate),2 ) as BasicValue ,ROUND((ServiceTax + EducessTax + SecHigherEducessTax + KrishiKalyantax + SwachhBharattax),2)as Taxamount
,TotalValue,ServiceTax,EducessTax,SecHigherEducessTax,KrishiKalyantax,SwachhBharattax,CostCenterCode
,TotalValue,ServiceTax,EducessTax,SecHigherEducessTax,KrishiKalyantax,SwachhBharattax,CostCenterCode,LineItem.ServiceFrequency
FROM T_PurchaseOrder_LineItem LineItem
join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
join T_Service_Tax Tax on Tax.LineItemNo = LineItem.LineItemNo

25
application/views/EditservicePurchaseorder.php
View File

@ -53,9 +53,12 @@ if(!empty($POMaster))
//$PaymentTerms=$Req->PaymentTerms;
$PayableAT=$Req->PayableAT;
$PaymentDays=$Req->PaymentDays;
$WrkStatus=$Req->ServiceWorkStatus;
}
}
//echo "$WrkStatus";
if(!empty($AvlBudAmt))
{
@ -724,8 +727,20 @@ $(document).ready(function () {
<div class="col-md-6">
<label>Work Status</label>
<?php
$options = array("0"=>'Select Status');
echo form_dropdown('workstatus', $options,set_value('workstatus'),'id="workstatus"' ,'required="true"' ,'class="form-control select2');
$options = array("0"=>$WrkStatus);
//print_r( $options);
if(!empty($WorkStatus))
{
foreach ($WorkStatus as $SID):
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('workstatus', $options,set_value('workstatus'),'id="workstatus"' ,'required="true"' ,'class="form-control select2');
?>
</div>
@ -1136,7 +1151,7 @@ $(document).ready(function () {
<label>Frequency</label>
<div>
<?php
$data = array('name' => 'Frequency','value' => set_value('Frequency'),'id'=>'Frequency', 'class' => 'form-control' );
$data = array('name' => 'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency', 'class' => 'form-control' );
echo form_input($data);
?>
</div>
@ -1348,6 +1363,7 @@ $(document).ready(function () {
<input type="hidden" name="<?php echo 'KrishiTax'.$index ?>" id="<?php echo 'KrishiTax'.$index ?>" value="<?php echo $record->KrishiKalyantax ; ?>" />
<input type="hidden" name="<?php echo 'SwachhTax'.$index ?>" id="<?php echo 'SwachhTax'.$index ?>" value="<?php echo $record->SwachhBharattax ; ?>" />
<input type="hidden" name="<?php echo 'TotalOrderValue'.$index ?>" id="<?php echo 'TotalOrderValue'.$index ?>" value="<?php echo $record->TotalValue ; ?>" />
<input type="hidden" name="<?php echo 'ServiceFrequency'.$index ?>" id="<?php echo 'ServiceFrequency'.$index ?>" value="<?php echo $record->ServiceFrequency ; ?>" />
<?php
if($POStatus == PO_DRAFT)
@ -1524,6 +1540,7 @@ var userid = '';
Mat: []
};
var paymentday=<?php echo json_encode($PaymentDays,JSON_PRETTY_PRINT)?>;
if (paymentday=="After")
{
@ -1558,6 +1575,8 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
$('#EditAfterSecHighTax').val($('#SecHighTax'+userid).val());
$('#EditAfterKrishiTax').val($('#KrishiTax'+userid).val());
$('#EditAfterSwachhTax').val($('#SwachhTax'+userid).val());
$('#EditFrequency').val($('#ServiceFrequency'+userid).val());
$('#EditTotalOrderValue').val(cellval[8].innerHTML);
RequistQuantity = $('#quantity'+userid).val();

39
application/views/servicePurchaseorder.php
View File

@ -679,10 +679,22 @@ $(document).ready(function () {
<label>Work Status</label>
<?php
$options = array("0"=>'Select Status');
$options = array("0"=>'Select Status');
//print_r( $options);
if(!empty($WorkStatus))
{
foreach ($WorkStatus as $SID):
$options[$SID->ConfigValue] = $SID->ConfigValue;
endforeach;
}
echo form_dropdown('workstatus', $options,set_value('workstatus'),'id="workstatus"' ,'required="true"' ,'class="form-control select2');
?>
</div>
<div class="col-md-12" id="Deliverydtdiv">
@ -1100,13 +1112,12 @@ $(document).ready(function () {
</div>
<div class="col-md-3">
<label>Frequency</label>
<div>
<?php
$options = array("0"=>'Select Frequency');
echo form_dropdown('Frequency', $options,set_value('Frequency'),'id="Frequency"' ,'class="form-control"');
?>
</div>
<div>
<?php
$data = array('name' => 'EditFrequency','value' => set_value('EditFrequency'),'id'=>'EditFrequency', 'class' => 'form-control' );
echo form_input($data);
?>
</div>
</div>
</div>
<div class="col-md-12">
@ -1421,6 +1432,9 @@ $("#EDITSERVICE").on("shown.bs.modal", function(e) {
$('#EditAfterSecHighTax').val($('#SecHighTax'+userid).val());
$('#EditAfterKrishiTax').val($('#KrishiTax'+userid).val());
$('#EditAfterSwachhTax').val($('#SwachhTax'+userid).val());
$('#EditFrequency').val($('#Frequency'+userid).val());
$('#EditTotalOrderValue').val(cellval[8].innerHTML);
@ -1504,6 +1518,8 @@ $('.AddService').click(function(){
var AfterSwachhTax = $("#AfterSwachhTax").val();
var Frequency=$("#Frequency").val();
var TotalOrderValue = $("#TotalOrderValue ").val();
@ -1553,8 +1569,10 @@ $('.AddService').click(function(){
addHidden(theForm,"SecHighTax"+temp,AfterSecHighTax);
addHidden(theForm,"KrishiTax"+temp,AfterKrishiTax);
addHidden(theForm,"SwachhTax"+temp,AfterSwachhTax);
addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue);
addHidden(theForm,"Frequency"+temp,Frequency);
addHidden(theForm,"TotalOrderValue"+temp,TotalOrderValue);
//alert(JSON.stringify($('#Frequency').val()));
//alert(ServiceTax);
$('#txtRowCount').val(temp);
clearServiceModalFields();
@ -1760,6 +1778,7 @@ function clearServiceModalFields()
$("#AfterKrishiTax").val('');
$("#AfterSwachhTax").val('');
$("#TotalOrderValue ").val('');
$("#Frequency").val('');
}
function DeleteRow(rowid)