Merge branch 'settings_backend' of bitbucket.org:code2lab/sxrestaurant

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(:name, :value)
+    end
+end

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

@@ -4,17 +4,19 @@ class Settings::SetMenuItemsController < ApplicationController
   # 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

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, :update]
+  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