git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change report UI

Browse Source
This commit is contained in:
phyusin
2018-05-09 13:34:30 +06:30
parent a11fc9e31c
commit 1e05522c42
2 changed files with 55 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/order_reservation.js
View File

@@ -73,7 +73,7 @@ $(function() {
var reason = ""; var reason = "";
var approved_code = $("#approved_code").text(); var approved_code = $("#approved_code").text();
if(order_status == 'ready_to_delivery'){ if(order_status == 'ready_to_delivery'){
reason = "VOID ::" + $('#reject_reason').val(); reason = "VOID || " + $('#reject_reason').val();
}else{ }else{
reason = $('#reject_reason').val(); reason = $('#reject_reason').val();
} }

82
app/views/reports/order_reservation/index.html.erb
View File

@@ -71,26 +71,45 @@
delimiter = "" delimiter = ""
end %> end %>
<% <%
total_amount = 0
discount_amount = 0 discount_amount = 0.0
delivery_fee = 0 delivery_fee = 0.0
convenience_charge = 0 convenience_charge = 0.0
total_tax = 0 delivery_tax = 0.0
delivery_tax = 0 convenience_tax = 0.0
convenience_tax = 0 commercial_tax = 0.0
commercial_tax = 0
grand_total = 0 total_discount_amount = 0
total_delivery_fee = 0
total_convenience_charge = 0
total_delivery_tax = 0
total_convenience_tax = 0
total_commercial_tax = 0
total_tax = 0.0
total_amount = 0.0
grand_total = 0.0
%> %>
<% unless @order_reservation_data.blank? %> <% unless @order_reservation_data.blank? %>
<% @order_reservation_data.each do |order_reservation| %> <% @order_reservation_data.each do |order_reservation| %>
<% <%
provider = "" provider = ""
total_amount = order_reservation.total_amount
discount_amount = order_reservation.discount_amount discount_amount = order_reservation.discount_amount
delivery_fee = order_reservation.delivery_fee delivery_fee = order_reservation.delivery_fee ? order_reservation.delivery_fee : 0.0
convenience_charge = order_reservation.convenience_charge convenience_charge = order_reservation.convenience_charge
total_tax = order_reservation.total_tax
grand_total = order_reservation.grand_total (order_reservation.taxes).each do |tax| %>
<% end
total_discount_amount += discount_amount.to_f
total_delivery_fee += delivery_fee.to_f
total_convenience_charge += convenience_charge
total_delivery_tax += delivery_tax
total_convenience_tax += convenience_tax
total_commercial_tax += commercial_tax
total_tax += order_reservation.total_tax
total_amount += order_reservation.total_amount
grand_total += order_reservation.grand_total
%> %>
<% <%
if order_reservation.provider == 'pick_up' if order_reservation.provider == 'pick_up'
@@ -100,12 +119,6 @@
else else
provider = order_reservation.provider provider = order_reservation.provider
end end
# JSON.parse(order_reservation.taxes).each do |tax|
# delivery_tax = tax.delivery_tax
# convenience_tax = tax.convenience_tax
# commercial_tax = tax.commercial_tax
# end
%> %>
<tr> <tr>
<td><%= order_reservation.email %></td> <td><%= order_reservation.email %></td>
@@ -114,18 +127,31 @@
<td><%= provider%></td> <td><%= provider%></td>
<td><%= order_reservation.payment_type%></td> <td><%= order_reservation.payment_type%></td>
<td><%= order_reservation.payment_status%></td> <td><%= order_reservation.payment_status%></td>
<td><%= number_with_precision(total_amount , precision:precision.to_i,delimiter:delimiter)%></td> <td><%= number_with_precision(order_reservation.total_amount, precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
<td><%= number_with_precision(discount_amount , precision:precision.to_i,delimiter:delimiter)%></td> <td><%= number_with_precision(discount_amount , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
<td><%= number_with_precision(delivery_fee , precision:precision.to_i,delimiter:delimiter)%></td> <td><%= number_with_precision(delivery_fee , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
<td><%= number_with_precision(convenience_charge , precision:precision.to_i,delimiter:delimiter)%></td> <td><%= number_with_precision(convenience_charge , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
<td><%= number_with_precision(delivery_tax , precision:precision.to_i,delimiter:delimiter)%></td> <td><%= number_with_precision(delivery_tax , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
<td><%= number_with_precision(convenience_tax , precision:precision.to_i,delimiter:delimiter)%></td> <td><%= number_with_precision(convenience_tax , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
<td><%= number_with_precision(commercial_tax , precision:precision.to_i,delimiter:delimiter)%></td> <td><%= number_with_precision(commercial_tax , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
<td><%= number_with_precision(total_tax , precision:precision.to_i,delimiter:delimiter)%></td> <td><%= number_with_precision(order_reservation.total_tax , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
<td><%= number_with_precision(grand_total , precision:precision.to_i,delimiter:delimiter)%></td> <td><%= number_with_precision(order_reservation.grand_total , precision:precision.to_i, delimiter:delimiter) rescue '0.0' %></td>
</tr> </tr>
<% end <% end
end %> end %>
<tr>
<td colspan="6"></td>
<td><b><%= number_with_precision(total_amount , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
<td><b><%= number_with_precision(total_discount_amount , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
<td><b><%= number_with_precision(total_delivery_fee , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
<td><b><%= number_with_precision(total_convenience_charge , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
<td><b><%= number_with_precision(total_delivery_tax , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
<td><b><%= number_with_precision(total_convenience_tax , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
<td><b><%= number_with_precision(total_commercial_tax , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
<td><b><%= number_with_precision(total_tax , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
<td><b><%= number_with_precision(grand_total , precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></b></td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>