merge with master

app/controllers/origami/customers_controller.rb

@@ -86,7 +86,7 @@ class Origami::CustomersController < BaseOrigamiController
     @crm_customer    = Customer.new
     @count_customer = Customer.count_customer
     
-    @taxes = TaxProfile.all.order("order_by asc")
+    @taxes = TaxProfile.where(:group_type => 'cashier')
     # if flash["errors"]
     #   @crm_customer.valid?
     # end

app/controllers/origami/dashboard_controller.rb

@@ -56,6 +56,22 @@ class Origami::DashboardController < BaseOrigamiController
     # get printer info
     @print_settings = PrintSetting.get_precision_delimiter()
     @current_user = current_user
+    #quick service
+    quick_service = Lookup.collection_of('quick_service')
+    @quick_service = 0
+    if !quick_service[0].nil?
+      @quick_service = quick_service[0][1]
+    end
+    #order reservation
+    order_reservation = Lookup.collection_of('order_reservation')
+    @order_reservation = 0
+    if !order_reservation.empty?
+        order_reservation.each do |order_reserve|
+            if order_reserve[0] == 'OrderReservation'
+                @order_reservation = order_reserve[1]
+            end
+        end
+    end
   end
 
 end

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/moveroom_controller.rb

@@ -3,6 +3,8 @@ class Origami::MoveroomController < BaseOrigamiController
   authorize_resource :class => false
   
   def move_dining
+    @webview = check_mobile
+    
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.all

app/controllers/origami/movetable_controller.rb

@@ -3,6 +3,8 @@ class Origami::MovetableController < BaseOrigamiController
   authorize_resource :class => false
 
   def move_dining
+    @webview = check_mobile
+
     @tables = Table.all.active.order('status desc')
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.all

app/controllers/origami/order_reservation_controller.rb

@@ -1,12 +1,14 @@
 class Origami::OrderReservationController < BaseOrigamiController
 
   def index
-  	@order = OrderReservation.all
+  	@order = OrderReservation.latest_order
+    @count_on_order = OrderReservation.get_count_on_order
   end
 
   def update
   	@id     = params[:order_id]
-  	@status = params[:status]
+    @status = params[:status]
+  	expected_waiting_time = params[:expected_time]
   	@order_reservation  = OrderReservation.find(@id)
 
   	status = true
@@ -25,7 +27,7 @@ class Origami::OrderReservationController < BaseOrigamiController
           OrderReservation.update_order_reservation(@id, nil, "cancelled")
   			  result = {:status=> true, :message => "rejected" }
 	  		else
-          OrderReservation.update_order_reservation(@id, nil, "accepted")
+          OrderReservation.update_order_reservation(@id, nil, "accepted", expected_waiting_time)
 	  			result = {:status=> true, :message => "accepted" }
 	  		end
   		end
@@ -50,7 +52,7 @@ class Origami::OrderReservationController < BaseOrigamiController
       status = params[:status]
     end
 
-    response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],status)
+    response = OrderReservation.send_status_to_ordering(params[:url],params[:ref_no],status,params[:waiting_time])
 
     render :json => response
   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/origami/payments_controller.rb

@@ -6,7 +6,7 @@ class Origami::PaymentsController < BaseOrigamiController
   def first_bill
     sale_id = params[:sale_id] # sale_id
     sale_data = Sale.find_by_sale_id(sale_id)
-    sale_items = SaleItem.where("sale_id=?",sale_id)
+    sale_items = SaleItem.unscoped.select("sale_id,product_code,item_instance_code,product_name,product_alt_name,account_id,status,remark,SUM(qty) as qty,SUM(unit_price) as unit_price,SUM(taxable_price) as taxable_price,SUM(price) as price,is_taxable").where("sale_id=?",sale_id).group("item_instance_code,unit_price")
     member_info = nil
     
     # For Cashier by Zone
@@ -99,6 +99,7 @@ class Origami::PaymentsController < BaseOrigamiController
 
     if(Sale.exists?(sale_id))
       saleObj = Sale.find(sale_id)
+      sale_items = SaleItem.unscoped.select("sale_id,product_code,item_instance_code,product_name,product_alt_name,account_id,status,remark,SUM(qty) as qty,SUM(unit_price) as unit_price,SUM(taxable_price) as taxable_price,SUM(price) as price,is_taxable").where("sale_id=?",sale_id).group("item_instance_code,unit_price")
       shop_details =  Shop.first 
       # rounding adjustment
       if shop_details.is_rounding_adj
@@ -204,7 +205,7 @@ class Origami::PaymentsController < BaseOrigamiController
         discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(saleObj.sale_items)
 
         printer = Printer::ReceiptPrinter.new(print_settings)
-        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data)
+        filename, sale_receipt_no, printer_name = printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Paid",current_balance,card_data)
 
         render json: JSON.generate({:status => saleObj.rebate_status, :message => "Can't Rebate coz of Sever Error ", :filename => filename, :receipt_no => sale_receipt_no, :printer_name => printer_name})
 

app/controllers/origami/pending_order_controller.rb

@@ -4,11 +4,12 @@ class Origami::PendingOrderController < BaseOrigamiController
     # @order = Order.where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status = 'billed' and source = 'quick_service'",DateTime.now.strftime('%Y-%m-%d'))
     @sale = Sale.pending_sale
     @order = Sale.pending_order
-
+    @completed = Sale.completed_sale
   end
   def show
     @sales  = Sale.pending_sale
     @orders = Sale.pending_order
+    @completed = Sale.completed_sale
     @id     = params[:sale_id]
     if(@id[0,3] == "SAL")     
       @sale = Sale.find(@id)
@@ -41,4 +42,27 @@ class Origami::PendingOrderController < BaseOrigamiController
     end
 
   end
+
+  def completed_sale
+    @sales     = Sale.pending_sale
+    @orders    = Sale.pending_order
+    @completed = Sale.completed_sale
+    @id        = params[:sale_id]
+     
+    @sale      = Sale.find(@id)
+    @order     = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
+    @booking   = BookingOrder.find_by_order_id(@order).booking_id
+    @bookings  = Booking.find(@booking)
+    @status    = "sale"
+    
+    if @bookings.dining_facility_id.to_i > 0
+      @table_id = Booking.find(@bookings.booking_id).dining_facility_id
+      @dining  = DiningFacility.find(@table_id)
+    else
+      @table_id = nil
+      @dining  = nil
+    end
+
+  end
+
 end