capital po pdf and changes fixed
This commit is contained in:
venbatechnologies@gmail.com
parent
921f656770
commit
81cbdab810
@ -1705,7 +1705,7 @@ function addNewImportPurchaseOrder()
|
||||
}
|
||||
}
|
||||
/* Add capital Po*/
|
||||
function addNewCapitalPurchaseOrder()
|
||||
function addNewCapitalPurchaseOrder()
|
||||
{
|
||||
|
||||
|
||||
@ -1730,38 +1730,47 @@ function addNewImportPurchaseOrder()
|
||||
|
||||
$DeliveryOption = $this->input->post('DateRange');
|
||||
|
||||
//echo $DeliveryOption;
|
||||
//die();
|
||||
|
||||
$DeliverySchedule='';
|
||||
$Dispatch='';
|
||||
$Deliverydt='';
|
||||
if($DeliveryOption==1)
|
||||
{
|
||||
$Dispatch='';
|
||||
$Deliverydt='';
|
||||
$DeliverySchedule = $this->input->post('Scheduleby');
|
||||
}
|
||||
|
||||
|
||||
else if($DeliveryOption==2)
|
||||
{
|
||||
$Deliverydt='';
|
||||
$DeliverySchedule = '';
|
||||
$Dispatch = $this->input->post('Dispatch');
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
$Dispatch = $this->input->post('Dispatch');
|
||||
$Dispatch = '';
|
||||
$DeliverySchedule = '';
|
||||
$Deliverydt = $this->getDateformat($dt);
|
||||
}
|
||||
$capitalType = $this->input->post('capitalType');
|
||||
if($capitalType=='Domestic'){
|
||||
$CapitalRange = '1';
|
||||
$ExchangeRateOn = '';
|
||||
$ExchangeRate='';
|
||||
$Palaceoforigin='';
|
||||
}
|
||||
else{
|
||||
|
||||
$CapitalRange = '0';
|
||||
$ExchangeRateOn = $this->input->post('ExchangeRateOn');
|
||||
$ExchangeRate=$this->input->post('ExchangeRt');
|
||||
$Palaceoforigin=$this->input->post('PlaceOforigin');
|
||||
}
|
||||
|
||||
$PaymentMethod = $this->input->post('PaymentMethod');
|
||||
|
||||
$Palaceoforigin=$this->input->post('PlaceOforigin');
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1781,7 +1790,7 @@ function addNewImportPurchaseOrder()
|
||||
$createddt = $dt->format('Y-m-d H:i:s');
|
||||
$currencytypeID = $this->input->post('currencytype');
|
||||
|
||||
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'ExchangeRate'=>$ExchangeRate,'PaymentTerms'=>$PaymentMethod,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CapitalRange'=>$CapitalRange,'POType'=>$POType,'CurrencyType'=>$currencytypeID,'DeliverySchedule'=>$DeliverySchedule,'Import_PlaceofOrgin'=>$Palaceoforigin,'Import_DispatchDetails'=>$Dispatch);
|
||||
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'ExchangeRate'=>$ExchangeRate,'PaymentTerms'=>$PaymentMethod,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CapitalRange'=>$CapitalRange,'POType'=>$POType,'CurrencyType'=>$currencytypeID,'DeliverySchedule'=>$DeliverySchedule,'Import_PlaceofOrgin'=>$Palaceoforigin,'Import_DispatchDetails'=>$Dispatch,'DeliveryDate'=>$Deliverydt);
|
||||
|
||||
// $POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'Import_DispatchDetails'=>$Dispatch,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'ExchangeRate'=>$Exchangerate,'ExchangeRateCalculatedon'=>$ExchangeRateCalculatedon,'CurrencyType'=>$CurrencyType,'PaymentTerms'=>$PaymentTerms,'POType'=>$POType,'Import_PlaceofOrgin'=>$Palaceoforigin);
|
||||
|
||||
@ -1945,21 +1954,27 @@ function addNewImportPurchaseOrder()
|
||||
|
||||
$DeliveryOption = $this->input->post('DateRange');
|
||||
|
||||
//echo $DeliveryOption;
|
||||
//die();
|
||||
$DeliverySchedule='';
|
||||
$Dispatch='';
|
||||
$Deliverydt='';
|
||||
if($DeliveryOption==1)
|
||||
{
|
||||
$Dispatch='';
|
||||
$Deliverydt='';
|
||||
$DeliverySchedule = $this->input->post('Scheduleby');
|
||||
}
|
||||
|
||||
|
||||
else if($DeliveryOption==2)
|
||||
{
|
||||
$Deliverydt='';
|
||||
$DeliverySchedule = '';
|
||||
$Dispatch = $this->input->post('Dispatch');
|
||||
}
|
||||
|
||||
else
|
||||
{
|
||||
$Dispatch = $this->input->post('Dispatch');
|
||||
$Dispatch = '';
|
||||
$DeliverySchedule = '';
|
||||
$Deliverydt = $this->getDateformat($dt);
|
||||
}
|
||||
|
||||
|
||||
@ -2001,7 +2016,7 @@ function addNewImportPurchaseOrder()
|
||||
$updateddt = $dt->format('Y-m-d H:i:s');
|
||||
|
||||
|
||||
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ExchangeRate'=>$ExchangeRate,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'PaymentTerms'=>$PaymentMethod,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CurrencyType'=>$currencytypeID,'DeliverySchedule'=>$DeliverySchedule,'Import_PlaceofOrgin'=>$Palaceoforigin,'Import_DispatchDetails'=>$Dispatch);
|
||||
$POList = array('SupplierID'=>$SupplierID, 'TotalOrderValue'=>$TotalOrder,'PODate'=>$PODate,'Status'=>$POStatus,'PORange'=>$PoRange,'ExchangeRate'=>$ExchangeRate,'ExchangeRateCalculatedon'=>$ExchangeRateOn,'PaymentTerms'=>$PaymentMethod,'ServiceDescription'=>$SpcialInstruction,'CreatedBy'=>$CreateBy,'DeliveryAddress'=>$DeliveryAddr,'CreatedDate'=>$createddt,'DeliverySchedule'=>$DeliverySchedule,'DeliveryOption'=>$DeliveryOption,'CurrencyType'=>$currencytypeID,'DeliverySchedule'=>$DeliverySchedule,'Import_PlaceofOrgin'=>$Palaceoforigin,'Import_DispatchDetails'=>$Dispatch,'DeliveryDate'=>$Deliverydt);
|
||||
|
||||
|
||||
$POMaster = $this->purchaseorder_model->updatePOMaster($PONO,$POList);
|
||||
|
||||
@ -121,9 +121,10 @@ foreach ($PaymentTerms as $TER)
|
||||
</script>
|
||||
|
||||
|
||||
<script>
|
||||
|
||||
<script type="text/javascript">
|
||||
var DelOpt = '<?php echo $DeliverOption; ?>';
|
||||
|
||||
var SchName = '<?php echo $DeliverSchedule; ?>';
|
||||
var DelDt = '<?php echo $Deliverydt; ?>';
|
||||
$(document).ready(function () {
|
||||
@ -213,11 +214,13 @@ $("#ItemName").val('');
|
||||
$("#Rate").val('');
|
||||
$("#txtBasicValue").val('');
|
||||
clearTaxField();
|
||||
$("#MaterialCode").empty();
|
||||
if(id != '0')
|
||||
{
|
||||
var y = <?php echo json_encode($RequistionDetails, JSON_PRETTY_PRINT) ?>;
|
||||
|
||||
var Material = <?php echo json_encode($MaterialList, JSON_PRETTY_PRINT) ?>;
|
||||
|
||||
var AvlBudAmt = '<?php echo $AvlAmount ?>';
|
||||
//ServiceTable
|
||||
var rows = document.getElementById('ServiceTable').rows.length;
|
||||
@ -225,7 +228,8 @@ $("#txtBasicValue").val('');
|
||||
if(DeletedMaterialCode!=undefined && DeletedMaterialCode!=''){
|
||||
|
||||
$("#MaterialCode").append( $('<option></option>').val(DeletedMaterialCode).html(DeletedMaterialCode + "-" + DeletedMaterialName));
|
||||
|
||||
DeletedMaterialCode='';
|
||||
DeletedMaterialCode='';
|
||||
}
|
||||
|
||||
for(i=2;i<=rows;i++){
|
||||
@ -277,6 +281,7 @@ for(i=2;i<=rows;i++){
|
||||
});
|
||||
$("#AvlBudAmt").val(parseFloat(AvlBudAmt).toFixed(2));
|
||||
// For Binding Material list center for the selected Requistion Number
|
||||
|
||||
$("#MaterialCode").append( $('<option></option>').val("0").html("Select Material Code") );
|
||||
var isAdded = "0";
|
||||
for(i=0;i<Material.length;i++)
|
||||
@ -1378,7 +1383,7 @@ $(document).ready(function () {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-5 col-md-offset-4" align="right">
|
||||
<label>Other Allowances In INR</label>>
|
||||
<label>Other Allowances In INR</label>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
@ -1391,7 +1396,7 @@ $(document).ready(function () {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-5 col-md-offset-4" align="right">
|
||||
<label><?php echo "Total Order Value ($INRSYM)";?></label>>
|
||||
<label><?php echo "Total Order Value ($INRSYM)";?></label>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
@ -1643,7 +1648,7 @@ $(document).ready(function () {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-5 col-md-offset-4" align="right">
|
||||
<label>Other Allowances In INR</label>>
|
||||
<label>Other Allowances In INR</label>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
@ -1656,7 +1661,7 @@ $(document).ready(function () {
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-5 col-md-offset-4" align="right">
|
||||
<label><?php echo "Total Order Value ($INRSYM)";?></label>>
|
||||
<label><?php echo "Total Order Value ($INRSYM)";?></label>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="form-group">
|
||||
|
||||
@ -17,6 +17,8 @@
|
||||
$DeliverySchedule='';
|
||||
$Import_DispatchDetails='';
|
||||
$Placeoforigin='';
|
||||
$ExchangeRate='';
|
||||
$CapitalRange='';
|
||||
if(!empty($CompanyDetails))
|
||||
{
|
||||
foreach ($CompanyDetails as $CO)
|
||||
@ -55,8 +57,8 @@
|
||||
$ServiceDescription =$PO->ServiceDescription;
|
||||
$PaymentTerms = $PO->PaymentTerms;
|
||||
$Placeoforigin=$PO->Import_PlaceofOrgin;
|
||||
|
||||
|
||||
$ExchangeRate = $PO->ExchangeRate;
|
||||
$CapitalRange = $PO->CapitalRange;
|
||||
}
|
||||
}
|
||||
$currencyName='INR';
|
||||
@ -104,7 +106,7 @@
|
||||
<tbody>
|
||||
<tr>
|
||||
|
||||
<td colspan="2">
|
||||
<td colspan="3">
|
||||
<p style="color:#3c8dbc;font-size:16px;"><strong><?php echo $CompanyName; ?></strong></p>
|
||||
<p> <?php echo $CompanyAddress; ?></p>
|
||||
</td>
|
||||
@ -115,16 +117,23 @@
|
||||
<p><strong>Vendor Address :</strong></p>
|
||||
<p><?php echo $SuplierName; ?><br /><?php echo $SuplierAddress; ?></p>
|
||||
</td>
|
||||
<td colspan="2">
|
||||
<td colspan="3">
|
||||
<p><strong>Delivery To :</strong></p>
|
||||
<p><?php echo $DeliveryAddress; ?></p>
|
||||
</td>
|
||||
</tr>
|
||||
<?php if ($CapitalRange =='0') { ?>
|
||||
<tr>
|
||||
<td>PO DATE :<?php echo $Podt; ?></td>
|
||||
<td colspan="2">DISPATCH / SCHEDULE BY :<?php echo $Import_DispatchDetails.$DeliverySchedule;?></td>
|
||||
<td>DISPATCH / SCHEDULE BY :<?php echo $Import_DispatchDetails.$DeliverySchedule;?></td>
|
||||
<td>PLACE OF ORIGIN:<?php echo $Placeoforigin; ?></td>
|
||||
</tr>
|
||||
<td>EXCHANGE RATE:<?php echo $ExchangeRate; ?></td>
|
||||
</tr><?php } else {?>
|
||||
<tr>
|
||||
<td>PO DATE :<?php echo $Podt; ?></td>
|
||||
<td colspan="3">DELIVERY DATE/ SCHEDULE BY :<?php echo $DeliveryDate.$DeliverySchedule;?></td>
|
||||
|
||||
</tr><?php }?>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
@ -167,6 +176,7 @@
|
||||
<tbody>
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>Item Code</th>
|
||||
<th>Item Name</th>
|
||||
<th>Qty</th>
|
||||
<th>UOM</p>
|
||||
@ -217,6 +227,7 @@
|
||||
?>
|
||||
<tr style="line-height: 1.5em;">
|
||||
<td><?php echo $index ; ?></td>
|
||||
<td> <?php echo $record->MaterialCode ; ?></td>
|
||||
<td><?php echo $record->MaterialName ; ?></td>
|
||||
<td align="right"><?php echo $record->Quantity ; ?></td>
|
||||
<td align="right"><?php echo $record->UOM ; ?></td>
|
||||
|
||||
@ -83,7 +83,7 @@ if(!empty($INRSYMBOL))
|
||||
plugins: "link image"
|
||||
});
|
||||
$(document).ready(function(){
|
||||
|
||||
$('#CapitalToatlOrder').val(0);
|
||||
//Initialize Select2 Elements
|
||||
$("#drpSupplier").select2();
|
||||
$("#Reqnumber").select2();
|
||||
@ -102,17 +102,24 @@ if(!empty($INRSYMBOL))
|
||||
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
|
||||
});
|
||||
$('#Date').click(function () {
|
||||
//for Date range selection
|
||||
//for Dispatch range selection
|
||||
$('#Schedulediv').hide();
|
||||
$('#Deliverydtdiv').show();
|
||||
$('#deliverydateby').hide();
|
||||
});
|
||||
$('#Schedule').click(function () {
|
||||
//for schedule range selection
|
||||
$('#Deliverydtdiv').hide();
|
||||
$('#Schedulediv').show();
|
||||
$('#deliverydateby').hide();
|
||||
});
|
||||
|
||||
|
||||
$('#DeliverycheckDate').click(function () {
|
||||
//for Delivery Date selection
|
||||
$('#Schedulediv').hide();
|
||||
$('#deliverydateby').show();
|
||||
$('#Deliverydtdiv').hide();
|
||||
});
|
||||
|
||||
});
|
||||
//document.getElementById("Date").checked = true;
|
||||
@ -319,23 +326,29 @@ function vaildateBeforeOpenModal()
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-4" style="padding:0px;">
|
||||
<div class="col-md-12" style="padding:0px;">
|
||||
|
||||
<b><u>Select Delivery By</u></b><br/>
|
||||
<tr>
|
||||
<div id="dispatchinternational">
|
||||
<td>
|
||||
<!-- <?php echo form_label('Date', 'Date') ." ". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?> </td> -->
|
||||
<?php echo form_label('Dispatch instruction', 'Dispatch instruction') ." ". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?> </td>
|
||||
<?php echo form_label('Dispatch instruction', 'Dispatch instruction') ." ". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"2", 'checked'=>set_radio('DateRange', '2', FALSE))); ?> </td>
|
||||
</div>
|
||||
<div id="datedomestic">
|
||||
<td>
|
||||
<?php echo form_label('Deilvery Date', 'Deilvery Date') ." ". form_radio(array("name"=>"DateRange", "id"=>"DeliverycheckDate", "value"=>"0", 'checked'=>set_radio('DateRange', '0', FALSE))); ?> </td>
|
||||
</div>
|
||||
<td>
|
||||
<?php echo form_label('Schedule', 'Schedule') ." ". form_radio(array("name"=>"DateRange", "id"=>"Schedule", "value"=>"1", 'checked'=>set_radio('DateRange', '1', FALSE))); ?>
|
||||
<?php echo form_label('Schedule', 'Schedule') ." ". form_radio(array("name"=>"DateRange", "id"=>"Schedule", "value"=>"1", 'checked'=>'checked')); ?>
|
||||
|
||||
</td>
|
||||
</tr>
|
||||
</div>
|
||||
|
||||
<div class="col-md-12" id="Schedulediv" style="display:none;"><br/>
|
||||
<label >Schedule :</label>
|
||||
<div class="col-md-12" id="Schedulediv"><br/>
|
||||
<label >Schedule </label>
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
|
||||
@ -343,7 +356,7 @@ function vaildateBeforeOpenModal()
|
||||
?>
|
||||
|
||||
</div>
|
||||
<div class="col-md-12" id="Deliverydtdiv"><br/>
|
||||
<div class="col-md-12" id="Deliverydtdiv" style="display:none;"><br/>
|
||||
<label>Dispatch Instruction</label>
|
||||
|
||||
<?php
|
||||
@ -355,6 +368,15 @@ function vaildateBeforeOpenModal()
|
||||
?>
|
||||
|
||||
</div>
|
||||
<div class="col-md-12" id="deliverydateby" style="display:none;"><br/>
|
||||
<label>Delivery Date</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Deliverydate','value' => set_value('Deliverydate',$CurrentDate),'id'=>'Deliverydate', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
@ -395,7 +417,7 @@ function vaildateBeforeOpenModal()
|
||||
</div>
|
||||
</div> -->
|
||||
|
||||
<div class="col-md-4">
|
||||
<div class="col-md-4" id="PlaceOforigindiv">
|
||||
<label>Place of Origin</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
@ -1657,7 +1679,7 @@ function vaildateBeforeOpenModal()
|
||||
|
||||
<div class="col-md-12" id="DOMdiv" style="border: 1px solid;padding:4px;">
|
||||
<div class="col-md-3">
|
||||
<label>CGST In INR</label>
|
||||
<label>CGST In <?php echo "($INR)"?></label>
|
||||
<?php
|
||||
$data = array('name' => 'txtTotCgst','value' => set_value('txtTotCgst'),'id'=>'txtTotCgst', 'class' => 'form-control num' ,'readonly' => 'true');
|
||||
echo form_input($data);
|
||||
@ -1666,21 +1688,21 @@ function vaildateBeforeOpenModal()
|
||||
|
||||
|
||||
<div class="col-md-3">
|
||||
<label>SGST In INR </label>
|
||||
<label>SGST In <?php echo "($INR)"?> </label>
|
||||
<?php
|
||||
$data = array('name' => 'txtTotSgst','value' => set_value('txtTotSgst'),'id'=>'txtTotSgst', 'class' => 'form-control num' ,'readonly' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label>IGST In INR </label>
|
||||
<label>IGST In <?php echo "($INR)"?> </label>
|
||||
<?php
|
||||
$data = array('name' => 'txtTotIgst','value' => set_value('txtTotIgst'),'id'=>'txtTotIgst', 'class' => 'form-control num' ,'readonly' => 'true');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label>Other Allowances In INR </label>
|
||||
<label>Other Allowances In <?php echo "($INR)"?> </label>
|
||||
<?php
|
||||
$data = array('name' => 'TotalOtherAllowances','value' => set_value('TotalOtherAllowances'),'id'=>'TotalOtherAllowances', 'class' => 'form-control num' ,'readonly' => 'true');
|
||||
echo form_input($data);
|
||||
@ -1804,17 +1826,18 @@ function vaildateBeforeOpenModal()
|
||||
?>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-12" style="border: 1px solid;padding:1% 0%;">
|
||||
<div class="col-md-4">
|
||||
<label >Total Order Value<?php echo "($INR)"?> </label>
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'CapitalToatlOrder','value' => set_value('CapitalToatlOrder'),'id'=>'CapitalToatlOrder', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<label>Special Instructions </label> <?php
|
||||
$data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction'),'id'=>'txtSpcialInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' );
|
||||
@ -1829,7 +1852,7 @@ function vaildateBeforeOpenModal()
|
||||
<input type="hidden" name="txtStatus" id="txtStatus" />
|
||||
<input type="hidden" name="txtRowCount" id="txtRowCount" />
|
||||
<input type="hidden" name="txtDeletedRow" id="txtDeletedRow" />
|
||||
<input type="hidden" name="CapitalToatlOrder" id="CapitalToatlOrder" />
|
||||
<!--<input type="hidden" name="CapitalToatlOrder" id="CapitalToatlOrder" /> -->
|
||||
|
||||
|
||||
|
||||
@ -1916,10 +1939,10 @@ function vaildateBeforeOpenModal()
|
||||
maxDate : 'now',
|
||||
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '-100:+0'
|
||||
});
|
||||
// $("#Deliverydt").datepicker({
|
||||
// minDate : 'now',
|
||||
// dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
|
||||
// });
|
||||
$("#Deliverydate").datepicker({
|
||||
minDate : 'now',
|
||||
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
|
||||
});
|
||||
|
||||
|
||||
var a=parseFloat($('#optcapital').val());
|
||||
@ -4201,7 +4224,9 @@ function SetCapitalPo()
|
||||
$('#CAPdiv').hide();
|
||||
$('#DOMdiv').hide();
|
||||
$('#EDITCAPdiv').hide();
|
||||
|
||||
$('#datedomestic').hide();
|
||||
$('#dispatchinternational').show();
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -4211,6 +4236,10 @@ function SetCapitalPo()
|
||||
$('#FromOnlineRate').hide();
|
||||
$('#hideExchangeRateOn').hide();
|
||||
$('#hideExchangeRate').hide();
|
||||
$('#dispatchinternational').hide();
|
||||
$('#PlaceOforigindiv').hide();
|
||||
$('#datedomestic').show();
|
||||
|
||||
|
||||
$('#currencytype').val('');
|
||||
$('#hideModalExchange').hide();
|
||||
@ -4274,4 +4303,4 @@ function calculateIgstTax(varBasicValue,Igst)
|
||||
</script>
|
||||
|
||||
|
||||
|
||||
|
||||
@ -157,8 +157,9 @@ if(!empty($AvlBudAmt))
|
||||
var DelDt = '<?php echo $Deliverydt; ?>';
|
||||
$(document).ready(function () {
|
||||
if(DelOpt=="0"){
|
||||
$('#Deliverydtdiv').show();
|
||||
$('#Deliverydtdiv').hide();
|
||||
$('#Schedulediv').hide();
|
||||
$('#deliverydateby').show();
|
||||
$('#Deliverydt').val(DelDt);
|
||||
}
|
||||
|
||||
@ -167,6 +168,14 @@ $('#Deliverydt').val(DelDt);
|
||||
$('#Schedulediv').show();
|
||||
$('#Deliverydt').val('');
|
||||
|
||||
$('#Scheduleby').val(SchName);
|
||||
}
|
||||
else if(DelOpt=="2"){
|
||||
$('#Deliverydtdiv').show();
|
||||
$('#Schedulediv').hide();
|
||||
$('#deliverydateby').hide();
|
||||
$('#Deliverydt').val('');
|
||||
|
||||
$('#Scheduleby').val(SchName);
|
||||
}
|
||||
});
|
||||
@ -190,7 +199,10 @@ window.onload = function()
|
||||
document.getElementById('EditModalImportTaxHide').style.display = 'none';
|
||||
document.getElementById('ExchangeRateModalViewDiv').style.display = 'none';
|
||||
document.getElementById('ViewModalImportTaxHide').style.display = 'none';
|
||||
|
||||
document.getElementById('PlaceOforigindiv').style.display = 'none';
|
||||
document.getElementById('dispatchinternational').style.display = 'none';
|
||||
document.getElementById('datedomestic').style.display = 'block';
|
||||
|
||||
|
||||
capitalType='Domestic';
|
||||
|
||||
@ -207,6 +219,9 @@ document.getElementById('ExchangeRateModalViewDiv').style.display = 'block';
|
||||
capitalType='International';
|
||||
document.getElementById('currencyTypeDiv').style.display = 'block';
|
||||
document.getElementById('ViewModalImportTaxHide').style.display = 'block';
|
||||
document.getElementById('dispatchinternational').style.display = 'block';
|
||||
document.getElementById('datedomestic').style.display = 'none';
|
||||
|
||||
}
|
||||
}
|
||||
</script>
|
||||
@ -234,15 +249,24 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
|
||||
minDate : 'now',
|
||||
dateFormat: 'mm/dd/yy',changeMonth: true, changeYear: true,yearRange: '0:+10'
|
||||
});
|
||||
$('#Date').click(function () {
|
||||
//for Date range selection
|
||||
$('#Date').click(function () {
|
||||
//for Dispatch range selection
|
||||
$('#Schedulediv').hide();
|
||||
$('#Deliverydtdiv').show();
|
||||
$('#deliverydateby').hide();
|
||||
});
|
||||
$('#Schedule').click(function () {
|
||||
//for schedule range selection
|
||||
$('#Deliverydtdiv').hide();
|
||||
$('#Schedulediv').show();
|
||||
$('#deliverydateby').hide();
|
||||
});
|
||||
|
||||
$('#DeliverycheckDate').click(function () {
|
||||
//for Delivery Date selection
|
||||
$('#Schedulediv').hide();
|
||||
$('#deliverydateby').show();
|
||||
$('#Deliverydtdiv').hide();
|
||||
});
|
||||
|
||||
});
|
||||
@ -386,12 +410,16 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
|
||||
|
||||
<b><u>Select Delivery By</u></b><br/>
|
||||
<tr>
|
||||
<div id="dispatchinternational" style="display:none;">
|
||||
<td>
|
||||
<!-- <?php echo form_label('Date', 'Date') . " ". form_radio(array('name' => 'DateRange', 'value' => '0', 'checked' => ('0' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Date')); ?> -->
|
||||
|
||||
<?php echo form_label('Dispatch instruction', 'Dispatch instruction') ." ". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?> </td>
|
||||
</td>
|
||||
</td>
|
||||
<?php echo form_label('Dispatch instruction', 'Dispatch instruction') ." ". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"2", 'checked'=>('2' == $DeliverOption) ? TRUE : FALSE)); ?> </td>
|
||||
</div>
|
||||
<div id="datedomestic" style="display:none;">
|
||||
<td>
|
||||
<?php echo form_label('Deilvery Date', 'Deilvery Date') ." ". form_radio(array("name"=>"DateRange", "id"=>"DeliverycheckDate", "value"=>"0", 'checked'=>('0' == $DeliverOption) ? TRUE : FALSE)); ?> </td>
|
||||
</div>
|
||||
<td>
|
||||
<?php echo form_label('Schedule', 'Schedule') . form_radio(array('name' => 'DateRange', 'value' => '1', 'checked' => ('1' == $DeliverOption) ? TRUE : FALSE, 'id' => 'Schedule')); ?>
|
||||
|
||||
@ -400,7 +428,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
|
||||
</div>
|
||||
|
||||
<div class="col-md-12" id="Schedulediv" style="display:none;"><br/>
|
||||
<label >Schedule :</label>
|
||||
<label >Schedule </label>
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'Scheduleby','value' => set_value('Scheduleby'),'id'=>'Scheduleby', 'class' => 'form-control' ,'required' => 'true' ,'rows' => '3', 'cols' => '40');
|
||||
@ -408,6 +436,15 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
|
||||
?>
|
||||
|
||||
</div>
|
||||
<div class="col-md-12" id="deliverydateby" style="display:none;"><br/>
|
||||
<label>Delivery Date</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
$data = array('name' => 'Deliverydate','value' => set_value('Deliverydate',$CurrentDate),'id'=>'Deliverydate', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12" id="Deliverydtdiv"><br/>
|
||||
<label>Dispatch Instruction</label>
|
||||
|
||||
@ -459,7 +496,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-3" id="PlaceOforigindiv">
|
||||
<label>Place of Origin</label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
@ -721,7 +758,7 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
|
||||
|
||||
}
|
||||
?> <input type="hidden" name="txtRowCount" id="txtRowCount" value="<?php echo $index;?>">
|
||||
<input type="hidden" name="CapitalToatlOrder" id="CapitalToatlOrder" value="<?php echo $totalCapitalOrder;?>">
|
||||
<!-- <input type="hidden" name="CapitalToatlOrder" id="CapitalToatlOrder" value="<?php echo $totalCapitalOrder;?>"> -->
|
||||
<input type="hidden" name="txtPONO" id="txtPONO" value="<?php echo $PONO; ?>"/>
|
||||
<input type="hidden" name="capitalType" id="capitalType" value="<?php echo $CapitalRange; ?>"/>
|
||||
|
||||
@ -2640,7 +2677,6 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -2663,6 +2699,17 @@ document.getElementById('currencyTypeDiv').style.display = 'block';
|
||||
|
||||
|
||||
</div>
|
||||
<div class="col-md-12" style="border: 1px solid;padding:1% 0%;">
|
||||
<div class="col-md-4">
|
||||
<label >Total Order Value<?php echo "($INR)"?> </label>
|
||||
|
||||
<?php
|
||||
$data = array('name' => 'CapitalToatlOrder','value' => set_value('CapitalToatlOrder',number_format($totalCapitalOrder, 2, '.', '')),'id'=>'CapitalToatlOrder', 'class' => 'form-control' ,'readonly' => 'true','style'=>'text-align:right;');
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-12">
|
||||
<label>Special Instructions :</label> <?php
|
||||
$data = array('name' => 'txtSpcialInstruction','value' => set_value('txtSpcialInstruction',$ServiceDescription),'id'=>'txtSpcialInstruction', 'class' => 'form-control','rows' => '10', 'cols' => '40' );
|
||||
@ -5258,4 +5305,4 @@ function calculateIgstTax(varBasicValue,Igst)
|
||||
|
||||
}
|
||||
|
||||
</script>
|
||||
</script>
|
||||
@ -96,6 +96,7 @@ $('#drpSupplier').change(function() {
|
||||
$.each(y, function(idx, obj) {
|
||||
if(obj.SupplierID === id)
|
||||
{
|
||||
|
||||
$("#SupAddress").val(obj.Address);
|
||||
|
||||
$("#SupAddress").val(obj.Address);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user