SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

po , amend po listing dispatch instruction issues and edit store requistion issue fixed

Browse Source
This commit is contained in:
gandhimathi 2017-08-19 16:13:11 +05:30
parent 3bebd53661
commit c9863762b5
7 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
application/views/AmendPOlist.php
View File

@ -57,14 +57,19 @@
<td><?php echo $record->StatusName ?></td> <td><?php echo $record->StatusName ?></td>
<td><?php $option = 'By Deliver Date'; <td><?php $option = 'By Deliver Date';
if($record->DeliveryOption == 1){ if($record->DeliveryOption == 1){
$option = "By Schedule" ; } $option = "By Schedule" ; }
else if($record->DeliveryOption == 2){
$option = "By Dispatch Instruction" ;
}
echo $option ?></td> echo $option ?></td>
<td align="right"><?php <td align="right"><?php
$Ddt = new DateTime($record->DeliveryDate); if($record->DeliveryOption == 0){ $Ddt = new DateTime($record->DeliveryDate);
$Deliverydt = $Ddt->format('d-m-Y'); $Deliverydt = $Ddt->format('d-m-Y');
echo $Deliverydt;
}
if($record->DeliveryOption == 1){$Deliverydt = '';} else if($record->DeliveryOption == 1){$Deliverydt = '';
echo $Deliverydt ?></td> echo $Deliverydt; }?></td>
<td><?php echo $record->DeliverySchedule ?></td> <td><?php echo $record->DeliverySchedule ?></td>

17
application/views/POlist.php
View File

@ -54,16 +54,21 @@
<td align="right"><?php echo $record->TotalOrderValue ?></td> <td align="right"><?php echo $record->TotalOrderValue ?></td>
<td><?php echo $record->StatusName ?></td> <td><?php echo $record->StatusName ?></td>
<td><?php $option = 'By Deliver Date'; <td><?php $option = 'By Deliver Date';
if($record->DeliveryOption == 1){ if($record->DeliveryOption == 1){
$option = "By Schedule" ; } $option = "By Schedule" ; }
else if($record->DeliveryOption == 2){
$option = "By Dispatch Instruction" ;
}
echo $option ?></td> echo $option ?></td>
<td align="right"><?php <td align="right"><?php
$Ddt = new DateTime($record->DeliveryDate); if($record->DeliveryOption == 0){ $Ddt = new DateTime($record->DeliveryDate);
$Deliverydt = $Ddt->format('d-m-Y'); $Deliverydt = $Ddt->format('d-m-Y');
echo $Deliverydt;
}
if($record->DeliveryOption == 1){$Deliverydt = '';} else if($record->DeliveryOption == 1){$Deliverydt = '';
echo $Deliverydt ?></td> echo $Deliverydt; }?></td>
<td><?php echo $record->DeliverySchedule ?></td> <td><?php echo $record->DeliverySchedule ?></td>
<?php $statusCode = $record->StatusCode; <?php $statusCode = $record->StatusCode;

2
application/views/editImportAmendPO.php
View File

@ -447,7 +447,7 @@ if(!empty($RequistionDetails))
<!-- <?php echo form_label('Date', 'Date') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td> --> <!-- <?php echo form_label('Date', 'Date') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td> -->
<?php echo form_label('Dispatch instruction', 'Dispatch instruction') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td> <?php echo form_label('Dispatch instruction', 'Dispatch instruction') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"2", 'checked'=>'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
<td> <td>
<?php echo form_label('Schedule', 'Schedule') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Schedule", "value"=>"1")); ?> <?php echo form_label('Schedule', 'Schedule') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Schedule", "value"=>"1")); ?>

2
application/views/editimportpo.php
View File

@ -460,7 +460,7 @@ if(!empty($RequistionDetails))
<b><u>Select Delivery By</u></b><br/> <b><u>Select Delivery By</u></b><br/>
<tr> <tr>
<td> <td>
<?php echo form_label('Dispatch instruction', 'Dispatch instruction') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td> <?php echo form_label('Dispatch instruction', 'Dispatch instruction') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"2", 'checked'=>'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
<td> <td>
<?php echo form_label('Schedule', 'Schedule') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Schedule", "value"=>"1")); ?> <?php echo form_label('Schedule', 'Schedule') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Schedule", "value"=>"1")); ?>

2
application/views/editstorerequisition.php
View File

@ -466,7 +466,7 @@ $(function() {
type: 'hidden', type: 'hidden',
id: 'Quantity' + j, id: 'Quantity' + j,
name: 'Quantity'+ j, name: 'Quantity'+ j,
value:obj.Quantity value:obj.QuantityRequired
}).appendTo('form'); }).appendTo('form');
$('<input>').attr({ $('<input>').attr({

2
application/views/importpo.php
View File

@ -353,7 +353,7 @@ function vaildateBeforeOpenModal()
<b><u>Select Delivery By</u></b><br/> <b><u>Select Delivery By</u></b><br/>
<tr> <tr>
<td> <td>
<?php echo form_label('Dispatch instruction', 'Dispatch instruction') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"0", 'checked'=>'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td> <?php echo form_label('Dispatch instruction', 'Dispatch instruction') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Date", "value"=>"2", 'checked'=>'checked')); ?>&nbsp;&nbsp;&nbsp;&nbsp;</td>
<td> <td>
<?php echo form_label('Schedule', 'Schedule') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Schedule", "value"=>"1")); ?> <?php echo form_label('Schedule', 'Schedule') ."&nbsp;&nbsp;". form_radio(array("name"=>"DateRange", "id"=>"Schedule", "value"=>"1")); ?>

2
application/views/storerequisition.php
View File

@ -88,7 +88,7 @@ span.highlight {
<td><?php echo $record->StatusName ?></td> <td><?php echo $record->StatusName ?></td>
<td align="right"><?php $dt = new DateTime($record->ReqDate); <td align="right"><?php $dt = new DateTime($record->ReqDate);
$ReqDate = $dt->format('d-m-y'); echo $ReqDate ?> $ReqDate = $dt->format('d-m-Y'); echo $ReqDate ?>
</td><td><?php echo $record->Remarks ?></td> </td><td><?php echo $record->Remarks ?></td>
<td> <a data-toggle="tooltip" href="<?php echo base_url().'EditStoreRequisition?StoreReqNo='.$record->StoreReqNo; ?>"><i class="fa fa-pencil" data-toggle="tooltip" title="<?php echo $record->StoreReqNo; ?> - Click here to view addstorerequisitionslip"></i>&nbsp;&nbsp;&nbsp;</a> <a data-toggle="tooltip" onclick="DeleteRow('<?php echo $record->StoreReqNo; ?>' )" ><span class="glyphicon glyphicon-trash" title="<?php echo $record->StoreReqNo; ?> - Click here to Delete Requisition details"></span></a> </td> <td> <a data-toggle="tooltip" href="<?php echo base_url().'EditStoreRequisition?StoreReqNo='.$record->StoreReqNo; ?>"><i class="fa fa-pencil" data-toggle="tooltip" title="<?php echo $record->StoreReqNo; ?> - Click here to view addstorerequisitionslip"></i>&nbsp;&nbsp;&nbsp;</a> <a data-toggle="tooltip" onclick="DeleteRow('<?php echo $record->StoreReqNo; ?>' )" ><span class="glyphicon glyphicon-trash" title="<?php echo $record->StoreReqNo; ?> - Click here to Delete Requisition details"></span></a> </td>