diff --git a/app/assets/javascripts/order_reservation.js b/app/assets/javascripts/order_reservation.js
index 2764d2a5..a1342846 100644
--- a/app/assets/javascripts/order_reservation.js
+++ b/app/assets/javascripts/order_reservation.js
@@ -73,7 +73,7 @@ $(function() {
       var reason    = "";
       var approved_code    = $("#approved_code").text();
       if(order_status == 'ready_to_delivery'){
-        reason = "VOID ::" + $('#reject_reason').val();
+        reason = "VOID || " + $('#reject_reason').val();
       }else{
         reason = $('#reject_reason').val();
       }
diff --git a/app/views/reports/order_reservation/index.html.erb b/app/views/reports/order_reservation/index.html.erb
index d10a234c..37157392 100755
--- a/app/views/reports/order_reservation/index.html.erb
+++ b/app/views/reports/order_reservation/index.html.erb
@@ -71,26 +71,45 @@
 							delimiter = ""
 					    end %>
 					    <%
-					    	total_amount = 0
-					    	discount_amount = 0
-					    	delivery_fee = 0
-					    	convenience_charge = 0
-					    	total_tax = 0
-					    	delivery_tax = 0
-					    	convenience_tax = 0
-					    	commercial_tax = 0
-					    	grand_total = 0
+					    	
+					    	discount_amount = 0.0
+					    	delivery_fee = 0.0
+					    	convenience_charge = 0.0
+					    	delivery_tax = 0.0
+					    	convenience_tax = 0.0
+					    	commercial_tax = 0.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? %>
 							<% @order_reservation_data.each do |order_reservation| %>
 								<% 
 									provider = "" 
-									total_amount = order_reservation.total_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
-									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'
@@ -100,12 +119,6 @@
 									else
 										provider = order_reservation.provider
 									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>
 									<td><%= order_reservation.email %></td>
@@ -114,18 +127,31 @@
 									<td><%= provider%></td>
 									<td><%= order_reservation.payment_type%></td>
 									<td><%= order_reservation.payment_status%></td>
-									<td><%= number_with_precision(total_amount ,  precision:precision.to_i,delimiter:delimiter)%></td>
-									<td><%= number_with_precision(discount_amount ,  precision:precision.to_i,delimiter:delimiter)%></td>
-									<td><%= number_with_precision(delivery_fee ,  precision:precision.to_i,delimiter:delimiter)%></td>
-									<td><%= number_with_precision(convenience_charge ,  precision:precision.to_i,delimiter:delimiter)%></td>
-									<td><%= number_with_precision(delivery_tax ,  precision:precision.to_i,delimiter:delimiter)%></td>
-									<td><%= number_with_precision(convenience_tax ,  precision:precision.to_i,delimiter:delimiter)%></td>
-									<td><%= number_with_precision(commercial_tax ,  precision:precision.to_i,delimiter:delimiter)%></td>
-									<td><%= number_with_precision(total_tax ,  precision:precision.to_i,delimiter:delimiter)%></td>
-									<td><%= number_with_precision(grand_total ,  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) rescue '0.0'%></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) rescue '0.0'%></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) rescue '0.0'%></td>
+									<td><%= number_with_precision(commercial_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
+									<td><%= number_with_precision(order_reservation.total_tax ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0'%></td>
+									<td><%= number_with_precision(order_reservation.grand_total ,  precision:precision.to_i, delimiter:delimiter) rescue '0.0' %></td>
 								</tr>
 							<% 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>
 				</table>
 			</div>