Merge branch 'august_spring' of bitbucket.org:code2lab/sxrestaurant into august_spring

app/controllers/api/bill_controller.rb

@@ -24,6 +24,7 @@ class Api::BillController < Api::ApiController
         @sale = Sale.new
         @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier)
       end
+      Promotion.promo_activate(@sale)
     else
       @status = false
       @error_message = "No Current Open Shift"

app/controllers/origami/commissioners_controller.rb

@@ -4,7 +4,7 @@ class Origami::CommissionersController < BaseOrigamiController
   # GET /commissioners
   # GET /commissioners.json
   def index
-    @commissioners = Commissioner.all
+    @commissioners = Commissioner.all.order("id asc")
   end
 
   # GET /commissioners/1

app/controllers/origami/commissions_controller.rb

@@ -30,11 +30,11 @@ class Origami::CommissionsController < BaseOrigamiController
 
     respond_to do |format|
       if @commission.save
-        format.html { redirect_to origami_commissions_path , notice: 'Commission was successfully created.' }
-        format.json { render :show, status: :created, location: @commission }
+        format.html {redirect_to origami_commissions_path, notice: 'Commission was successfully created.'}
+        format.json {render :show, status: :created, location: @commission}
       else
-        format.html { render :new }
-        format.json { render json: @commission.errors, status: :unprocessable_entity }
+        format.html {render :new}
+        format.json {render json: @commission.errors, status: :unprocessable_entity}
       end
     end
   end
@@ -44,11 +44,11 @@ class Origami::CommissionsController < BaseOrigamiController
   def update
     respond_to do |format|
       if @commission.update(commission_params)
-        format.html { redirect_to  origami_commission_path(@commission), notice: 'Commission was successfully updated.' }
-        format.json { render :show, status: :ok, location: @commission }
+        format.html {redirect_to origami_commission_path(@commission), notice: 'Commission was successfully updated.'}
+        format.json {render :show, status: :ok, location: @commission}
       else
-        format.html { render :edit }
-        format.json { render json: @commission.errors, status: :unprocessable_entity }
+        format.html {render :edit}
+        format.json {render json: @commission.errors, status: :unprocessable_entity}
       end
     end
   end
@@ -58,8 +58,8 @@ class Origami::CommissionsController < BaseOrigamiController
   def destroy
     @commission.destroy
     respond_to do |format|
-      format.html { redirect_to origami_commissions_path, notice: 'Commission was successfully destroyed.' }
-      format.json { head :no_content }
+      format.html {redirect_to origami_commissions_path, notice: 'Commission was successfully destroyed.'}
+      format.json {head :no_content}
     end
   end
 
@@ -72,20 +72,20 @@ class Origami::CommissionsController < BaseOrigamiController
   end
 
   def select_sale_item
-    byebug
+    # byebug
     sale_item_id = params[:sale_item_id]
     @sale_item = SaleItem.find_by_sale_item_id(sale_item_id)
     @commissioners = Commissioner.active.all
   end
 
   private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_commission
-      @commission = Commission.find(params[:id])
-    end
+  # Use callbacks to share common setup or constraints between actions.
+  def set_commission
+    @commission = Commission.find(params[:id])
+  end
 
-    # Never trust parameters from the scary internet, only allow the white list through.
-    def commission_params
-      params.require(:commission).permit(:product_id,:amount,:commission_type, :is_active)
-    end
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def commission_params
+    params.require(:commission).permit(:product_id, :amount, :commission_type, :is_active)
+  end
 end

app/controllers/origami/in_juties_controller.rb

@@ -0,0 +1,74 @@
+class Origami::InJutiesController < BaseOrigamiController
+  before_action :set_in_juty, only: [:show, :edit, :update, :destroy]
+
+  # GET /in_juties
+  # GET /in_juties.json
+  def index
+    @in_juties = InJuty.all
+  end
+
+  # GET /in_juties/1
+  # GET /in_juties/1.json
+  def show
+  end
+
+  # GET /in_juties/new
+  def new
+    @in_juty = InJuty.new
+  end
+
+  # GET /in_juties/1/edit
+  def edit
+  end
+
+  # POST /in_juties
+  # POST /in_juties.json
+  def create
+    @in_juty = InJuty.new(in_juty_params)
+
+    respond_to do |format|
+      if @in_juty.save
+        format.html { redirect_to origami_in_juties_path, notice: 'In juty was successfully created.' }
+        format.json { render :show, status: :created, location: @in_juty }
+      else
+        format.html { render :new }
+        format.json { render json: @in_juty.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /in_juties/1
+  # PATCH/PUT /in_juties/1.json
+  def update
+    respond_to do |format|
+      if @in_juty.update(in_juty_params)
+        format.html { redirect_to origami_in_juty_path(@in_juty), notice: 'In juty was successfully updated.' }
+        format.json { render :show, status: :ok, location: @in_juty }
+      else
+        format.html { render :edit }
+        format.json { render json: @in_juty.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /in_juties/1
+  # DELETE /in_juties/1.json
+  def destroy
+    @in_juty.destroy
+    respond_to do |format|
+      format.html { redirect_to origami_in_juties_path, notice: 'In juty was successfully destroyed.' }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_in_juty
+      @in_juty = InJuty.find(params[:id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def in_juty_params
+      params.require(:in_juty).permit(:dinning_id,:commissioner_ids,:in_time,:out_time)
+    end
+end

app/controllers/settings/menu_item_instances_controller.rb

@@ -55,7 +55,7 @@ class Settings::MenuItemInstancesController < ApplicationController
       sets = ItemSet.find(params[:menu_item_instance][:item_sets])
 
       if sets.count > 0
-        @settings_menu_item.item_sets = sets
+        @settings_menu_item_instances.item_sets = sets
       end
     end
 
@@ -92,7 +92,7 @@ class Settings::MenuItemInstancesController < ApplicationController
       sets = ItemSet.find(params[:menu_item_instance][:item_sets])
 
       if sets.count > 0
-        @settings_menu_item.item_sets = sets
+        @settings_menu_item_instances.item_sets = sets
       end
     end
     

app/controllers/settings/set_menu_items_controller.rb

@@ -132,6 +132,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(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id,:account_id , :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by, :item_sets)
+      params.require(:set_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id,:account_id , :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by, :item_sets, :unit)
     end
 end

app/controllers/settings/simple_menu_items_controller.rb

@@ -154,6 +154,6 @@ class Settings::SimpleMenuItemsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def settings_menu_item_params
-      params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id, :account_id, :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by, :item_sets)
+      params.require(:simple_menu_item).permit(:item_code, :name, :alt_name, :type, :image_path, :menu_category_id, :account_id, :item_attributes, :item_options, :min_qty, :is_sub_item, :is_available, :created_by, :item_sets, :unit)
     end
 end