origin pull master

app/controllers/api/orders_controller.rb

@@ -39,8 +39,8 @@ class Api::OrdersController <  Api::ApiController
 
       #Create Table Booking or Room Booking
       if !params["booking_id"].nil? && params[:booking_id].to_i > 0
-        @order.new_booking = false
-        # @order.new_booking = true
+         #@order.new_booking = false
+         @order.new_booking = true
         @order.booking_id = params[:booking_id]
       end
 

app/controllers/oqs/home_controller.rb

@@ -1,6 +1,50 @@
 class Oqs::HomeController < BaseOqsController
   def index
+  	queue_stations=OrderQueueStation.all
+  	
+  	@queue_items_details = queue_items_query(0)
+
+    @queue_completed_item = queue_items_query(1)	
+   
+    @queue_stations_items=Array.new
+
+    # Calculate Count for each station tab
+    queue_stations.each do |que| 
+      i=0
+      @queue_items_details.each do |qid|                 
+        if qid.station_name == que.station_name 
+          i=i+1                                                
+        end         
+      end 
+      @queue_stations_items.push({:station_name => que.station_name, :is_active => que.is_active ,:item_count => i })                           
+    end
+
+    @queue_stations_items
   end
+
   def show
   end
+
+  # update delivery status when complete click
+  def update_delivery_status
+    assigned_item_id = params[:id]
+    assigned_item=AssignedOrderItem.find(assigned_item_id)
+    assigned_item.delivery_status=true
+    assigned_item.save          
+  end
+
+  # Query for OQS with status
+  def queue_items_query(status)
+    AssignedOrderItem.select("assigned_order_items.id, oqs.station_name, oqs.is_active, df.name as zone, odt.item_code, odt.item_name, odt.price, odt.qty, odt.item_order_by, cus.name as customer_name, odt.created_at")
+    .joins("join order_queue_process_by_zones as oqpz ON oqpz.order_queue_station_id = assigned_order_items.order_queue_station_id
+              left join dining_facilities as df on df.zone_id = oqpz.zone_id
+              left join order_queue_stations as oqs ON oqs.id = assigned_order_items.order_queue_station_id
+              left join orders as od ON od.id = assigned_order_items.order_id
+              left join order_items as odt ON odt.item_code = assigned_order_items.item_code
+              left join customers as cus ON cus.id = od.customer_id")
+    .where("assigned_order_items.delivery_status = #{status}") 
+    .group("assigned_order_items.id")
+    .order("odt.item_name DESC") 
+  end
 end
+

app/controllers/oqs/print_controller.rb

@@ -0,0 +1,16 @@
+class Oqs::PrintController < ApplicationController
+  def print
+  	unique_code="OrderItemPdf"
+  	assigned_item_id=params[:id]
+  	assigned_order_item=AssignedOrderItem.select("order_id, item_code").where('id='+assigned_item_id)
+
+  	print_settings=PrintSetting.find_by_unique_code(unique_code)
+    order_queue_printer= Printer::OrderQueuePrinter.new(print_settings)
+  	order_queue_printer.print_order_item(print_settings,assigned_order_item[0].order_id, assigned_order_item[0].item_code )
+
+  	# update print status when complete click  
+    assigned_item=AssignedOrderItem.find(assigned_item_id)
+    assigned_item.print_status=true
+    assigned_item.save            	
+  end
+end

app/controllers/print_settings_controller.rb

@@ -0,0 +1,74 @@
+class PrintSettingsController < ApplicationController
+  before_action :set_print_setting, only: [:show, :edit, :update, :destroy]
+
+  # GET /print_settings
+  # GET /print_settings.json
+  def index
+    @print_settings = PrintSetting.all
+  end
+
+  # GET /print_settings/1
+  # GET /print_settings/1.json
+  def show
+  end
+
+  # GET /print_settings/new
+  def new
+    @print_setting = PrintSetting.new
+  end
+
+  # GET /print_settings/1/edit
+  def edit
+  end
+
+  # POST /print_settings
+  # POST /print_settings.json
+  def create
+    @print_setting = PrintSetting.new(print_setting_params)
+
+    respond_to do |format|
+      if @print_setting.save
+        format.html { redirect_to @print_setting, notice: 'Print setting was successfully created.' }
+        format.json { render :show, status: :created, location: @print_setting }
+      else
+        format.html { render :new }
+        format.json { render json: @print_setting.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /print_settings/1
+  # PATCH/PUT /print_settings/1.json
+  def update
+    respond_to do |format|
+      if @print_setting.update(print_setting_params)
+        format.html { redirect_to @print_setting, notice: 'Print setting was successfully updated.' }
+        format.json { render :show, status: :ok, location: @print_setting }
+      else
+        format.html { render :edit }
+        format.json { render json: @print_setting.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /print_settings/1
+  # DELETE /print_settings/1.json
+  def destroy
+    @print_setting.destroy
+    respond_to do |format|
+      format.html { redirect_to print_settings_url, notice: 'Print setting was successfully destroyed.' }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_print_setting
+      @print_setting = PrintSetting.find(params[:id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def print_setting_params
+      params.require(:print_setting).permit(:name, :unique_code, :template, :db_name, :db_type, :db_username, :db_password, :printer_name, :api_settings, :page_width, :page_height, :print_copies)
+    end
+end

app/controllers/settings/menu_categories_controller.rb

@@ -5,7 +5,7 @@ class Settings::MenuCategoriesController < ApplicationController
   # GET /settings/menu_categories
   # GET /settings/menu_categories.json
   def index
-    @settings_menu_categories = MenuCategory.all
+    @settings_menu_categories = MenuCategory.all.page(params[:page]).per(10)
   end
 
   # GET /settings/menu_categories/1
@@ -63,7 +63,7 @@ class Settings::MenuCategoriesController < ApplicationController
   # DELETE /settings/menu_categories/1
   # DELETE /settings/menu_categories/1.json
   def destroy
-    @settings_menu_category.destroy
+    # @settings_menu_category.destroy
     respond_to do |format|
       format.html { redirect_to settings_menu_categories_path, notice: 'Menu category was successfully destroyed.' }
       format.json { head :no_content }

app/controllers/settings/menu_item_instances_controller.rb

@@ -0,0 +1,79 @@
+class Settings::MenuItemInstancesController < ApplicationController
+  before_action :set_settings_menu_item_instance, only: [:show, :edit, :update, :destroy]
+  before_action :set_settings_menu_item, only: [:index, :show, :edit, :new, :update]
+
+  # GET /settings/menu_item_instances
+  # GET /settings/menu_item_instances.json
+  def index
+    @settings_menu_item_instances = MenuItemInstance.all
+  end
+
+  # GET /settings/menu_item_instances/1
+  # GET /settings/menu_item_instances/1.json
+  def show
+  end
+
+  # GET /settings/menu_item_instances/new
+  def new
+    @settings_menu_item_instance = MenuItemInstance.new
+  end
+
+  # GET /settings/menu_item_instances/1/edit
+  def edit
+  end
+
+  # POST /settings/menu_item_instances
+  # POST /settings/menu_item_instances.json
+  def create
+    @settings_menu_item_instance = MenuItemInstance.new(settings_menu_item_instance_params)
+
+    respond_to do |format|
+      if @settings_menu_item_instance.save
+        format.html { redirect_to settings_menu_item_instances_path, notice: 'Menu item instance was successfully created.' }
+        format.json { render :show, status: :created, location: @settings_menu_item_instance }
+      else
+        format.html { render :new }
+        format.json { render json: @settings_menu_item_instance.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /settings/menu_item_instances/1
+  # PATCH/PUT /settings/menu_item_instances/1.json
+  def update
+    respond_to do |format|
+      if @settings_menu_item_instance.update(settings_menu_item_instance_params)
+        format.html { redirect_to settings_menu_item_instance_path(@settings_menu_item_instance), notice: 'Menu item instance was successfully updated.' }
+        format.json { render :show, status: :ok, location: @settings_menu_item_instance }
+      else
+        format.html { render :edit }
+        format.json { render json: @settings_menu_item_instance.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /settings/menu_item_instances/1
+  # DELETE /settings/menu_item_instances/1.json
+  def destroy
+    # @settings_menu_item_instance.destroy
+    respond_to do |format|
+      format.html { redirect_to settings_menu_item_instances_path, notice: 'Menu item instance was successfully destroyed.' }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_settings_menu_item_instance
+      @set_settings_menu_item_instances = MenuItemInstance.find(params[:id])
+    end
+
+    def set_settings_menu_item
+      @item = MenuItem.find(params[:menu_item_id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def settings_menu_item_instance_params
+      params.require(:menu_item_instance).permit(:item_instance_code, :item_instance_name, :price, :is_on_promotion, :promotion_price, :is_available)
+    end
+end

app/controllers/settings/menus_controller.rb

@@ -4,12 +4,13 @@ class Settings::MenusController < ApplicationController
   # GET /settings/menus
   # GET /settings/menus.json
   def index
-    @settings_menus = Menu.all
+    @settings_menus = Menu.all.page(params[:page]).per(10)
   end
 
   # GET /settings/menus/1
   # GET /settings/menus/1.json
   def show
+    @settings_menu_categories = @settings_menu.menu_categories.page(params[:page]).per(10)
   end
 
   # GET /settings/menus/new
@@ -25,7 +26,7 @@ class Settings::MenusController < ApplicationController
   # POST /settings/menus.json
   def create
     @settings_menu = Menu.new(settings_menu_params)
-
+    @settings_menu.created_by = current_login_employee.name
     respond_to do |format|
       if @settings_menu.save
         format.html { redirect_to settings_menus_path, notice: 'Menu was successfully created.' }
@@ -42,7 +43,7 @@ class Settings::MenusController < ApplicationController
   def update
     respond_to do |format|
       if @settings_menu.update(settings_menu_params)
-        format.html { redirect_to settings_menu_path(@settings_menu), notice: 'Menu was successfully updated.' }
+        format.html { redirect_to settings_menus_path, notice: 'Menu was successfully updated.' }
         format.json { render :show, status: :ok, location: @settings_menu }
       else
         format.html { render :edit }

app/controllers/settings/order_queue_stations_controller.rb

@@ -1,5 +1,5 @@
 class Settings::OrderQueueStationsController < ApplicationController
-  before_action :set_settings_order_queue_station, only: [:show, :edit,:new, :update, :destroy]
+  before_action :set_settings_order_queue_station, only: [:show, :edit, :update, :destroy]
 
   # GET /settings/order_queue_stations
   # GET /settings/order_queue_stations.json
@@ -25,10 +25,10 @@ class Settings::OrderQueueStationsController < ApplicationController
   # POST /settings/order_queue_stations.json
   def create
     @settings_order_queue_station = OrderQueueStation.new(settings_order_queue_station_params)
-
+    @settings_order_queue_station.created_by = current_login_employee.name
     respond_to do |format|
       if @settings_order_queue_station.save
-        format.html { redirect_to @settings_order_queue_station, notice: 'Order queue station was successfully created.' }
+        format.html { redirect_to settings_order_queue_stations_path, notice: 'Order queue station was successfully created.' }
         format.json { render :show, status: :created, location: @settings_order_queue_station }
       else
         format.html { render :new }

app/controllers/settings/set_menu_items_controller.rb

@@ -1,20 +1,22 @@
 class Settings::SetMenuItemsController < ApplicationController
   before_action :set_settings_menu_item, only: [:show, :edit, :update, :destroy]
-  before_action :set_settings_menu_category, only: [:index, :show, :edit, :new]
+  before_action :set_settings_menu_category, only: [:index, :show, :edit, :new, :update]
   # GET /settings/menu_items
   # GET /settings/menu_items.json
   def index
-    @settings_menu_items = @category.menu_items
+    @settings_menu_items = @category.menu_items.page(params[:page]).per(10)
   end
-
+ 
   # GET /settings/menu_items/1
   # GET /settings/menu_items/1.json
   def show
+    @sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10)
   end
 
   # GET /settings/menu_items/new
   def new
     @settings_menu_item = MenuItem.new
+    @settings_menu_item.type = "SetMenuItem"
   end
 
   # GET /settings/menu_items/1/edit
@@ -25,10 +27,13 @@ class Settings::SetMenuItemsController < ApplicationController
   # POST /settings/menu_items.json
   def create
     @settings_menu_item = MenuItem.new(settings_menu_item_params)
-
+    if params[:simple_menu_item][:menu_item_id] == ''
+      @settings_menu_item.menu_category_id = params[:menu_category_id]
+    end
+    @settings_menu_item.created_by = current_login_employee.name
     respond_to do |format|
       if @settings_menu_item.save
-        format.html { redirect_to settings_menu_items_path, notice: 'Menu item was successfully created.' }
+        format.html { redirect_to settings_menu_category_set_menu_items_path, notice: 'Menu item was successfully created.' }
         format.json { render :show, status: :created, location: @settings_menu_item }
       else
         format.html { render :new }
@@ -42,7 +47,7 @@ class Settings::SetMenuItemsController < ApplicationController
   def update
     respond_to do |format|
       if @settings_menu_item.update(settings_menu_item_params)
-        format.html { redirect_to settings_menu_item_path(@settings_menu_item), notice: 'Menu item was successfully updated.' }
+        format.html { redirect_to settings_menu_category_set_menu_items_path, notice: 'Menu item was successfully updated.' }
         format.json { render :show, status: :ok, location: @settings_menu_item }
       else
         format.html { render :edit }
@@ -54,9 +59,9 @@ class Settings::SetMenuItemsController < ApplicationController
   # DELETE /settings/menu_items/1
   # DELETE /settings/menu_items/1.json
   def destroy
-    @settings_menu_item.destroy
+    # @settings_menu_item.destroy
     respond_to do |format|
-      format.html { redirect_to settings_menu_items_path, notice: 'Menu item was successfully destroyed.' }
+      format.html { redirect_to settings_menu_category_set_menu_items_path, notice: 'Menu item was successfully destroyed.' }
       format.json { head :no_content }
     end
   end
@@ -73,6 +78,6 @@ class Settings::SetMenuItemsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_menu_item_params
-      params.require(:menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by)
+      params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :menu_category_id, :menu_item_id, :min_qty, :min_selectable_item, :max_selectable_item, :created_by)
     end
 end

app/controllers/settings/simple_menu_items_controller.rb

@@ -1,15 +1,17 @@
 class Settings::SimpleMenuItemsController < ApplicationController
-  before_action :set_settings_menu_item, only: [:show, :edit, :update, :destroy]
-  before_action :set_settings_menu_category, only: [:index, :show, :edit, :new]
+  before_action :set_settings_menu_item, only: [:show, :edit, :update, :destroy ]
+  before_action :set_settings_menu_category, only: [:index, :show, :edit, :new, :update ,:create]
   # GET /settings/menu_items
   # GET /settings/menu_items.json
   def index
-    @settings_menu_items = @category.menu_items
+    @settings_menu_items = @category.menu_items.page(params[:page]).per(10)
   end
-
+ 
   # GET /settings/menu_items/1
   # GET /settings/menu_items/1.json
   def show
+    @sub_menu = MenuItem.where("menu_item_id=?",params[:id]).page(params[:page]).per(10)
+    @menu_item_instance = MenuItemInstance.where("menu_item_id=?",params[:id]).page(params[:page]).per(10)
   end
 
   # GET /settings/menu_items/new
@@ -25,10 +27,13 @@ class Settings::SimpleMenuItemsController < ApplicationController
   # POST /settings/menu_items.json
   def create
     @settings_menu_item = MenuItem.new(settings_menu_item_params)
-
+    if params[:simple_menu_item][:menu_item_id] == ''
+      @settings_menu_item.menu_category_id = params[:menu_category_id]
+    end
+    @settings_menu_item.created_by = current_login_employee.name
     respond_to do |format|
       if @settings_menu_item.save
-        format.html { redirect_to settings_menu_items_path, notice: 'Menu item was successfully created.' }
+        format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully created.' }
         format.json { render :show, status: :created, location: @settings_menu_item }
       else
         format.html { render :new }
@@ -42,7 +47,7 @@ class Settings::SimpleMenuItemsController < ApplicationController
   def update
     respond_to do |format|
       if @settings_menu_item.update(settings_menu_item_params)
-        format.html { redirect_to settings_menu_item_path(@settings_menu_item), notice: 'Menu item was successfully updated.' }
+        format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully updated.' }
         format.json { render :show, status: :ok, location: @settings_menu_item }
       else
         format.html { render :edit }
@@ -54,9 +59,9 @@ class Settings::SimpleMenuItemsController < ApplicationController
   # DELETE /settings/menu_items/1
   # DELETE /settings/menu_items/1.json
   def destroy
-    @settings_menu_item.destroy
+    # @settings_menu_item.destroy
     respond_to do |format|
-      format.html { redirect_to settings_menu_items_path, notice: 'Menu item was successfully destroyed.' }
+      format.html { redirect_to settings_menu_category_simple_menu_items_path, notice: 'Menu item was successfully destroyed.' }
       format.json { head :no_content }
     end
   end

app/controllers/transactions/sales_controller.rb

@@ -0,0 +1,74 @@
+class Transactions::SalesController < ApplicationController
+  before_action :set_transactions_sale, only: [:show, :edit, :update, :destroy]
+
+  # GET /transactions/sales
+  # GET /transactions/sales.json
+  def index
+    @transactions_sales = Sale.all
+  end
+
+  # GET /transactions/sales/1
+  # GET /transactions/sales/1.json
+  def show
+  end
+
+  # GET /transactions/sales/new
+  def new
+    @transactions_sale = Sale.new
+  end
+
+  # GET /transactions/sales/1/edit
+  def edit
+  end
+
+  # POST /transactions/sales
+  # POST /transactions/sales.json
+  def create
+    @transactions_sale = Sale.new(transactions_sale_params)
+
+    respond_to do |format|
+      if @transactions_sale.save
+        format.html { redirect_to @transactions_sale, notice: 'Sale was successfully created.' }
+        format.json { render :show, status: :created, location: @transactions_sale }
+      else
+        format.html { render :new }
+        format.json { render json: @transactions_sale.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /transactions/sales/1
+  # PATCH/PUT /transactions/sales/1.json
+  def update
+    respond_to do |format|
+      if @transactions_sale.update(transactions_sale_params)
+        format.html { redirect_to @transactions_sale, notice: 'Sale was successfully updated.' }
+        format.json { render :show, status: :ok, location: @transactions_sale }
+      else
+        format.html { render :edit }
+        format.json { render json: @transactions_sale.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /transactions/sales/1
+  # DELETE /transactions/sales/1.json
+  def destroy
+    @transactions_sale.destroy
+    respond_to do |format|
+      format.html { redirect_to transactions_sales_url, notice: 'Sale was successfully destroyed.' }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_transactions_sale
+      @transactions_sale = Sale.find(params[:id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def transactions_sale_params
+      params.require(:transactions_sale).permit(:cashier_id, :cashier_name, :requested_by, :requested_at, :receipt_no, :receipt_date, :customer_id, :payment_status, :sale_status, :total_amount, :total_discount, :total_tax, :tax_type, :grand_total, :rounding_adjustment, :amount_received, :amount_changed)
+    end
+end