Merge branch 'r-1902001-01-dev' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev

app/controllers/api/void_controller.rb

@@ -8,7 +8,7 @@ class Api::VoidController <  Api::ApiController
 
 			if sale.discount_type == "member_discount"
 				sale.update_attributes(total_discount: 0)
-				sale.compute_by_sale_items(sale_id, sale.sale_items,0,order_source)
+				sale.compute_by_sale_items(0, nil, order_source)
 			end
 
 			# update count for shift sale
@@ -25,18 +25,17 @@ class Api::VoidController <  Api::ApiController
 				  shift.save
 				end
 			end
-		        
+
 			sale.rounding_adjustment = 0.0
 			sale.payment_status = 'void'
 			sale.sale_status = 'void'
 			sale.save
-		  
+
 		  	# remark = "Void Sale ID #{sale_id} | Receipt No #{sale.receipt_no} | Receipt No #{sale.receipt_no} | Table ->#{table.name}"
 		  	sale_audit = SaleAudit.record_audit_for_edit(sale_id,current_login_employee.name, current_login_employee.name,nil,"SALEVOID" )
 			render json: JSON.generate({:status => true, :message => "Void successful."})
 		else
 			render json: JSON.generate({:status => false, :error_message => "There is no sale for '#{params[:sale_id]}'!"})
 		end
-	end 
+	end
 end
-