merge with master

app/controllers/origami/payments_controller.rb

@@ -113,7 +113,9 @@ class Origami::PaymentsController < BaseOrigamiController
         end
       end
       #end rounding adjustment
-
+      puts "sale"
+      puts saleObj.to_json
+      
       sale_payment = SalePayment.new
       sale_payment.process_payment(saleObj, current_user.name, cash, "cash")
 
@@ -161,12 +163,24 @@ class Origami::PaymentsController < BaseOrigamiController
         
         if customer.membership_id != nil && rebate && credit_data.nil?
           member_info    = Customer.get_member_account(customer)
-          if member_info["status"] == true
-            rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
-            current_balance = SaleAudit.paymal_search(sale_id)
-          end
+          rebate_amount  = Customer.get_membership_transactions(customer,saleObj.receipt_no)
+          current_balance = SaleAudit.paymal_search(sale_id)
         end
         
+        #orders print out
+        if params[:type] == "quick_service"
+          booking = Booking.find_by_sale_id(sale_id)
+          if booking.dining_facility_id.to_i>0
+            table_id = booking.dining_facility_id
+          else
+            table_id = 0
+          end
+          
+          booking.booking_orders.each do |order|
+            Order.pay_process_order_queue(order.order_id,table_id)
+          end
+        end
+
         #for card sale data
         card_data = Array.new
         card_sale_trans_ref_no = Sale.getCardSaleTrans(sale_id)