update OQS and cashier

app/controllers/origami/addorders_controller.rb

@@ -67,7 +67,7 @@ class Origami::AddordersController < ApplicationController#BaseOrigamiController
     @order.guest = params[:guest_info]
     @order.table_id = params[:table_id]  # this is dining facilities's id
     @order.new_booking = true
-    @order.employee_name = current_login_employee.name
+    @order.waiters = current_login_employee.name
       #Create Table Booking or Room Booking
       if !params["booking_id"].nil?
         # check booking id is already completed.

app/controllers/origami/home_controller.rb

@@ -24,6 +24,7 @@ class Origami::HomeController < BaseOrigamiController
 
     @dining.bookings.active.each do |booking|
          if booking.sale_id.nil? && booking.booking_status != 'moved'
+
            @order_items = Array.new
            booking.booking_orders.each do |booking_order|
               order = Order.find(booking_order.order_id)
@@ -31,26 +32,42 @@ class Origami::HomeController < BaseOrigamiController
                 @obj_order = order
                 @customer = order.customer
                 @date = order.created_at
+                @booking= booking
                 order.order_items.each do |item|
                   @order_items.push(item)
                 end
+                accounts = @customer.tax_profiles
+                @account_arr =[]
+                accounts.each do |acc|
+                  account = TaxProfile.find(acc)
+                  @account_arr.push(account)
+                end
               end
            end
            @status_order = 'order'
          else
           sale = Sale.find(booking.sale_id)
            if sale.sale_status != "completed" && sale.sale_status != 'void'
+
              @sale_array.push(sale)
              if @status_order == 'order'
                @status_order = 'sale'
              end
+             @booking= booking
              @date = sale.created_at
              @status_sale = 'sale'
              @obj_sale = sale
              @customer = sale.customer
+             accounts = @customer.tax_profiles
+                @account_arr =[]
+                accounts.each do |acc|
+                  account = TaxProfile.find(acc)
+                  @account_arr.push(account)
+                end
            end
          end
      end
+     
   end
 
 private

app/controllers/origami/payments_controller.rb

@@ -116,6 +116,13 @@ class Origami::PaymentsController < BaseOrigamiController
 
       #get customer amount
       @customer = Customer.find(@sale_data.customer_id)
+      accounts = @customer.tax_profiles
+      @account_arr =[]
+      accounts.each do |acc|
+        account = TaxProfile.find(acc)
+        @account_arr.push(account)
+      end
+      
       rebate = MembershipSetting.find_by_rebate(1)
       # get member information
       if @customer.membership_id != nil && rebate
@@ -136,6 +143,7 @@ class Origami::PaymentsController < BaseOrigamiController
       @sale_data.bookings.each do |sbk|
         df = DiningFacility.find(sbk.dining_facility_id)
         @table_no = df.type + ' ' + df.name
+        @checkin_time = sbk.checkin_at
         break
       end
 

app/controllers/origami/rooms_controller.rb

@@ -24,10 +24,12 @@ class Origami::RoomsController < BaseOrigamiController
            @order_items = Array.new
            booking.booking_orders.each do |booking_order|
               order = Order.find(booking_order.order_id)
+              @customer = order.customer
               if (order.status == "new")
                 @obj_order = order
-                @customer = order.customer
+                
                 @date = order.created_at
+                @booking = booking
                 order.order_items.each do |item|
                   @order_items.push(item)
                 end
@@ -42,6 +44,7 @@ class Origami::RoomsController < BaseOrigamiController
              if @status_order == 'order'
                @status_order = 'sale'
              end
+             @booking = booking
              @date = sale.created_at
              @status_sale = 'sale'
              @obj_sale = sale

app/controllers/transactions/credit_notes_controller.rb

@@ -15,12 +15,11 @@ class Transactions::CreditNotesController < ApplicationController
 
       if filter.nil? && from.nil? && to.nil? && customer.nil?
           @sales = Sale.where('payment_status = ?', Sale::SALE_STATUS_OUTSTANDING)
-          puts "cccccccccccc"
       else
           sale = Sale.search_credit_sales(customer,filter,from,to) 
           if sale.count > 0
              @sales = sale 
-             @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50)
+             @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(20)
            else
              @sales = 0
            end  

app/controllers/transactions/orders_controller.rb

@@ -9,19 +9,18 @@ class Transactions::OrdersController < ApplicationController
 
 		if filter.nil? && from.nil? && to.nil? && count.nil?
 		    orders = Order.order("order_id desc")
-		    puts "ssssss"
+		    
 		else
 		    orders = Order.search(filter,from,to,count)
-		    puts "aaaaa"
 		     
 		end    
 		    
 		if !orders.nil?
-			@orders = Kaminari.paginate_array(orders).page(params[:page]).per(50)
+			@orders = Kaminari.paginate_array(orders).page(params[:page]).per(20)
 		else
 			@orders = []
 		end
-		puts @orders.to_json
+		
 		respond_to do |format|
 			format.html # index.html.erb
 			format.json { render json: @orders }

app/controllers/transactions/sales_controller.rb

@@ -11,13 +11,13 @@ class Transactions::SalesController < ApplicationController
     to         = params[:to]
 
     if receipt_no.nil? && from.nil? && to.nil?
-        @sales = Sale.where("NOT sale_status = 'void' " ).order("sale_id desc").limit(500) 
-        @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50)
+        @sales = Sale.where("NOT sale_status = 'void' " ).order("sale_id desc") 
+        @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(20)
     else
         sale = Sale.search(receipt_no,from,to)
         if sale.count > 0
            @sales = sale 
-           @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(50)
+           @sales = Kaminari.paginate_array(@sales).page(params[:page]).per(20)
          else
            @sales = 0
          end