finished report for all

This commit is contained in:
Aung Myo
2017-07-17 11:22:24 +06:30
parent 0b7b5cae30
commit 25ef380b4f
16 changed files with 792 additions and 990 deletions

View File

@@ -134,15 +134,11 @@
<td><span><%= grand_total%></span></td>
</tr>
<% end %>
<!-- <tr style="border-top:2px solid grey;">
<td colspan="5">&nbsp;</td>
<td>Total Amount</td>
<td><span><%= grand_total%></span></td>
</tr> -->
<!-- <tr>
<tr>
<td colspan="5">&nbsp;</td>
<td>Cash Received</td>
<td><span><%= @cash_data %></span></td>
<td><span><%= @cash_data - @change_amount %></span></td>
</tr>
<tr>
<td colspan="5">&nbsp;</td>
@@ -168,8 +164,8 @@
<td colspan="5">&nbsp;</td>
<td>Grand Total</td>
<!-- <td><span class="double_underline"><%= grand_total.to_f - @discount_data.to_f%></span></td> -->
<!-- <td><span class="double_underline"><%= @grand_total%></span></td>
</tr> -->
<td><span class="double_underline"><%= @grand_total - @change_amount%></span></td>
</tr>
</tbody>
</table>
</div>
@@ -256,9 +252,10 @@
var local_date = data.message[index].local_opening_date + ' - ' + data.message[index].local_closing_date;
var sh_date = data.message[index].opening_date + ' - ' + data.message[index].closing_date;
var shift_id = data.message[index].shift_id ;
if(param_shift != ''){
if(sh_date == param_shift){
if(shift_id == param_shift){
selected = 'selected = "selected"';
}
else{
@@ -270,7 +267,7 @@
}
str += '<option value="'+ sh_date +'" '+ selected +'>' + local_date + '</option>';
str += '<option value="'+ shift_id +'" '+ selected +'>' + local_date + '</option>';
// console.log(sh_date)
})
@@ -278,10 +275,5 @@
});
}
//total price by account
$('#items_table tr').each(function(i){
});
});
</script>