change order reservation

app/controllers/api/order_reserve/order_reservation_controller.rb

@@ -59,7 +59,7 @@ class Api::OrderReserve::OrderReservationController < Api::ApiController
 			order_reservation = params
 			order_reservation_id, flag = OrderReservation.addOrderReservationInfo(order_reservation)
 
-			order_reservation = OrderReservation.find(order_reservation_id)
+			order_reservation = OrderReservation.latest_order.where("status = 'new'") #find(order_reservation_id)
 			if flag #&& ENV["SERVER_MODE"] != 'cloud'
 				ActionCable.server.broadcast "order_reservation_channel",data: order_reservation
 			end

app/controllers/origami/addorders_controller.rb

@@ -23,6 +23,8 @@ class Origami::AddordersController < BaseOrigamiController
     day = Date.today.wday
     @menus    = Menu.all
     @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
+    puts "ssssssssssssssssssssssss"
+    puts @menu.to_json
     @table_id = params[:id]
     @table = DiningFacility.find(@table_id)
     @booking = @table.get_booking

app/controllers/origami/dinga_controller.rb

@@ -86,11 +86,12 @@ def create
 
       # saleObj = Sale.find(sale_id)
       sale_payment = SalePayment.new
-      status, @sale = sale_payment.process_payment(saleObj, @user, cash, "dinga",account_no)
-      if status == true
+      status, @sale,@membership_data = sale_payment.process_payment(saleObj, @user, cash, "dinga",account_no)
+
+      if status == true && @membership_data["status"] == true
         @out = true, "Success!"
       else
-        @out =false, "Please try again payment!"
+        @out =false, @membership_data["message"]
       end
     end
   end

app/controllers/origami/paymal_controller.rb

@@ -88,11 +88,11 @@ def create
 
 	      # saleObj = Sale.find(sale_id)
 	      sale_payment = SalePayment.new
-	      status, @sale = sale_payment.process_payment(saleObj, @user, cash, "paymal",account_no)
-        if status == true
+	      status, @sale,@membership_data = sale_payment.process_payment(saleObj, @user, cash, "paymal",account_no)
+        if status == true && @membership_data["status"] == true
           @out = true, "Success!"
         else
-          @out =false, "Please try again payment!"
+          @out =false, @membership_data["message"]
         end
       end
     end

app/controllers/reports/receipt_no_controller.rb

@@ -20,7 +20,7 @@ authorize_resource :class => false
 	    payment_type = params[:payment_type]
         @sale_data = Sale.get_shift_sales_by_receipt_no(@shift_sale_range,@shift,from,to,payment_type) 
         @sale_taxes = Sale.get_separate_tax(@shift_sale_range,@shift,from,to,payment_type)
-        @tax_profiles = TaxProfile.order('order_by asc')
+        @tax_profiles = TaxProfile.order('order_by asc').limit(2)
         @from       = from
         @to         = to
         # get printer info