fixed fonflict

app/controllers/origami/home_controller.rb

@@ -1,84 +1,50 @@
 class Origami::HomeController < BaseOrigamiController
+ before_action :set_dining, only: [:show]
+
   def index
-    if params[:booking_id] != nil
-      type=params[:booking_id].split('-')[0];
-      # Sale
-      if type == "SAL"
-        @selected_item = Sale.find(params[:booking_id])
-        @selected_item_type="Sale"
-      # Booking
-      else
-        @selected_item = Order.find(params[:booking_id])
-        @selected_item_type="Order"
-      end
-    end
-
-    @completed_orders = Order.get_completed_order()
-  	@booking_orders = Order.get_booking_order_table()
-  	@booking_rooms = Order.get_booking_order_rooms()
-  	@orders = Order.get_orders()
+    @tables = Table.all.active.order('status desc')
+    @rooms = Room.all.active.order('status desc')
+    @complete = Sale.all
+    @orders = Order.all.order('date desc')
   end
 
-  def item_show
-  	selection(params[:booking_id],1)
-  end
-
-  def selection(selected_id, is_ajax)
-    str = []
-    type=selected_id.split('-')[0];
-    # Sale
-    if type == "SAL"
-      @order_details = SaleItem.get_order_items_details(params[:booking_id])
-      @order_details.each do |ord_detail|
-        str.push(ord_detail)
-      end
-    # Booking
-    else
-      @order_details = OrderItem.get_order_items_details(params[:booking_id])
-      @order_details.each do |ord_detail|
-        str.push(ord_detail)
-      end    
-    end 
-
-    if is_ajax == 1
-      render :json => str.to_json
-    else
-      str
+ # origami table detail
+  def show
+    @tables = Table.all.active.order('status desc')
+    @rooms = Room.all.active.order('status desc')
+    @complete = Sale.all
+    @orders = Order.all.order('date desc')
+    @status_order = ""
+    @dining.bookings.each do |booking|
+         if booking.sale_id.nil?
+           @order_items = Array.new
+           booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              @obj_order = order
+              @date = order.created_at
+              order.order_items.each do |item|
+                @order_items.push(item)
+              end
+           end
+           @status_order = 'order'
+         else
+          sale = Sale.find(booking.sale_id)
+           if sale.sale_status != "completed"
+             if @status_order == 'order'
+               @status_order = 'sale'
+             end
+             @date = sale.created_at
+             @status_sale = 'sale'
+             @obj_sale = sale
+           end
+         end
     end
   end
 
-  def update_sale_by_customer
+private
 
-    id = params[:sale_id][0,3]
-    if(id == "SAL")
-       sale   = Sale.find(params[:sale_id])
-    else
-       sale   = Order.find(params[:sale_id])
-    end
-
-    status = sale.update_attributes(customer_id: params[:customer_id])
-
-    if status == true
-        render json: JSON.generate({:status => true})
-    else
-        render json: JSON.generate({:status => false, :error_message => "Record not found"})
-
-    end
-  end
-
-  def get_customer
-
-    @customer       = Customer.find(params[:customer_id])
-
-    response        = Customer.get_member_account(@customer)
-
-    respond_to do |format|
-    format.js do
-      render :json => {
-        :response_data => response.as_json,
-        :customer => @customer}
-     end
-     end
-  end
+def set_dining
+   @dining = DiningFacility.find(params[:dining_id])
+end
 
 end

app/controllers/origami/home_controller_bk.rb

@@ -0,0 +1,84 @@
+class Origami::HomeController < BaseOrigamiController
+  def index
+    if params[:booking_id] != nil
+      type=params[:booking_id].split('-')[0];
+      # Sale
+      if type == "SAL"
+        @selected_item = Sale.find(params[:booking_id])
+        @selected_item_type="Sale"
+      # Booking
+      else
+        @selected_item = Order.find(params[:booking_id])
+        @selected_item_type="Order"
+      end
+    end
+
+    @completed_orders = Order.get_completed_order()
+  	@booking_orders = Order.get_booking_order_table()
+  	@booking_rooms = Order.get_booking_order_rooms()
+  	@orders = Order.get_orders()
+  end
+
+  def item_show
+  	selection(params[:booking_id],1)
+  end
+
+  def selection(selected_id, is_ajax)
+    str = []
+    type=selected_id.split('-')[0];
+    # Sale
+    if type == "SAL"
+      @order_details = SaleItem.get_order_items_details(params[:booking_id])
+      @order_details.each do |ord_detail|
+        str.push(ord_detail)
+      end
+    # Booking
+    else
+      @order_details = OrderItem.get_order_items_details(params[:booking_id])
+      @order_details.each do |ord_detail|
+        str.push(ord_detail)
+      end    
+    end 
+
+    if is_ajax == 1
+      render :json => str.to_json
+    else
+      str
+    end
+  end
+
+  def update_sale_by_customer
+
+    id = params[:sale_id][0,3]
+    if(id == "SAL")
+       sale   = Sale.find(params[:sale_id])
+    else
+       sale   = Order.find(params[:sale_id])
+    end
+
+    status = sale.update_attributes(customer_id: params[:customer_id])
+
+    if status == true
+        render json: JSON.generate({:status => true})
+    else
+        render json: JSON.generate({:status => false, :error_message => "Record not found"})
+
+    end
+  end
+
+  def get_customer
+
+    @customer       = Customer.find(params[:customer_id])
+
+    response        = Customer.get_member_account(@customer)
+
+    respond_to do |format|
+    format.js do
+      render :json => {
+        :response_data => response.as_json,
+        :customer => @customer}
+     end
+     end
+  end
+
+end

app/controllers/origami/moveroom_controller.rb

@@ -0,0 +1,37 @@
+class Origami::MoveroomController < BaseOrigamiController
+
+  def move_dining
+    @tables = Table.all.active.order('status desc')
+    @rooms = Room.all.active.order('status desc')
+    @complete = Sale.all
+    @orders = Order.all.order('date desc')
+
+    @status_order = ""
+    @dining = DiningFacility.find(params[:dining_id])
+    @dining.bookings.each do |booking|
+         if booking.sale_id.nil?
+           @order_items = Array.new
+           booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              @obj_order = order
+              @date = order.created_at
+              order.order_items.each do |item|
+                @order_items.push(item)
+              end
+           end
+           @status_order = 'order'
+         else
+          sale = Sale.find(booking.sale_id)
+           if sale.sale_status != "completed"
+             if @status_order == 'order'
+               @status_order = 'sale'
+             end
+             @date = sale.created_at
+             @status_sale = 'sale'
+             @obj_sale = sale
+           end
+         end
+    end
+  end
+  
+end

app/controllers/origami/movetable_controller.rb

@@ -0,0 +1,49 @@
+class Origami::MovetableController < BaseOrigamiController
+
+  def move_dining
+    @tables = Table.all.active.order('status desc')
+    @rooms = Room.all.active.order('status desc')
+    @complete = Sale.all
+    @orders = Order.all.order('date desc')
+
+    @status_order = ""
+    @dining = DiningFacility.find(params[:dining_id])
+    @dining.bookings.each do |booking|
+         if booking.sale_id.nil?
+           @order_items = Array.new
+           booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              @obj_order = order
+              @date = order.created_at
+              order.order_items.each do |item|
+                @order_items.push(item)
+              end
+           end
+           @status_order = 'order'
+         else
+          sale = Sale.find(booking.sale_id)
+           if sale.sale_status != "completed"
+             if @status_order == 'order'
+               @status_order = 'sale'
+             end
+             @date = sale.created_at
+             @status_sale = 'sale'
+             @obj_sale = sale
+           end
+         end
+    end
+  end
+
+   def moving
+     change_to = params[:change_to] #new
+     change_from = params[:change_from] #original
+     bookings = Booking.where('dining_facility_id=?',change_from)
+     booking_array = Array.new
+     bookings.each do | booking |
+       if booking.sale_id.nil? || booking.sale.sale_status != 'completed'
+         booking_array.push(booking)
+       end
+     end
+     @get_type = Booking.update_dining_facility(booking_array,change_to,change_from)
+   end
+end

app/controllers/origami/orders_controller.rb

@@ -0,0 +1,10 @@
+class Origami::OrdersController < BaseOrigamiController
+
+  def show
+    @tables = Table.all.active.order('status desc')
+    @rooms = Room.all.active.order('status desc')
+    @complete = Sale.all
+    @orders = Order.all.order('date desc')
+    @order = Order.find(params[:order_id])
+  end
+end

app/controllers/origami/request_bills_controller.rb

@@ -4,8 +4,9 @@ class Origami::RequestBillsController < BaseOrigamiController
     @sale = Sale.new
     sale_order=SaleOrder.new
 
-    booking_id = params[:id]
-    check_booking = Booking.find_by_booking_id(booking_id)
+    order_id = params[:id] # order_id
+    bk_order = BookingOrder.find_by_order_id(order_id)
+    check_booking = Booking.find_by_booking_id(bk_order.booking_id)
     if check_booking.sale_id.nil?
       # Create Sale if it doesn't exist
       puts "current_login_employee"
@@ -34,7 +35,9 @@ class Origami::RequestBillsController < BaseOrigamiController
     food_total, beverage_total = SaleItem.calculate_food_beverage(@sale_items)
 
     printer = Printer::ReceiptPrinter.new(print_settings)
+
     printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, food_total, beverage_total,member_info)
     redirect_to origami_path(@sale_data.sale_id)
+
   end
 end

app/controllers/origami/rooms_controller.rb

@@ -0,0 +1,32 @@
+class Origami::RoomsController < BaseOrigamiController
+
+  def show
+    @tables = Table.all.active.order('status desc')
+    @rooms = Room.all.active.order('status desc')
+    @complete = Sale.all
+    @orders = Order.all.order('date desc')
+    @room = DiningFacility.find(params[:room_id])
+    @room.bookings.each do |booking|
+         if booking.sale_id.nil?
+           @order_items = Array.new
+           booking.booking_orders.each do |booking_order|
+              order = Order.find(booking_order.order_id)
+              @obj = order
+              order.order_items.each do |item|
+                @order_items.push(item)
+              end
+           end
+           @status = 'order'
+         else
+
+          sale = Sale.find(booking.sale_id)
+           if sale.sale_status != "completed"
+             @status = 'sale'
+             @obj = sale
+           end
+         end
+    end
+  end
+
+
+end

app/controllers/origami/sales_controller.rb

@@ -0,0 +1,10 @@
+class Origami::SalesController < BaseOrigamiController
+
+  def show
+    @tables = Table.all.active.order('status desc')
+    @rooms = Room.all.active.order('status desc')
+    @complete = Sale.all
+    @orders = Order.all.order('date desc')
+    @sale = Sale.find(params[:sale_id])
+  end
+end