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

app/controllers/origami/customers_controller.rb

@@ -60,6 +60,7 @@ class Origami::CustomersController < BaseOrigamiController
 
     id = params[:sale_id][0,3]
     customer_id = params[:customer_id]
+    customer    = Customer.find(customer_id)
 
     # Check and find with card no
     # if(!customer_id.include? "CUS")
@@ -74,7 +75,7 @@ class Origami::CustomersController < BaseOrigamiController
        status = sale.update_attributes(customer_id: customer_id)
        sale.sale_orders.each do |sale_order|
         order = Order.find(sale_order.order_id)
-          status = order.update_attributes(customer_id: customer_id)
+          status = order.update_attributes(customer_id: customer_id,order_type:customer.customer_type)
       end
     else
        @booking = BookingOrder.find_by_order_id(params[:sale_id])
@@ -82,7 +83,7 @@ class Origami::CustomersController < BaseOrigamiController
 
         @orders.each do |bo|
           order  = Order.find(bo.order_id)
-          status = order.update_attributes(customer_id: customer_id)
+          status = order.update_attributes(customer_id: customer_id,order_type:customer.customer_type)
        end
 
     end

app/controllers/origami/payments_controller.rb

@@ -163,6 +163,35 @@ class Origami::PaymentsController < BaseOrigamiController
       printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "Re-print")
   end
 
+  def foc
+    cash          = params[:cash]
+    sale_id       = params[:sale_id]
+    sub_total       = params[:sub_total]
+    member_info   = nil
+    rebate_amount = nil
+
+    if(Sale.exists?(sale_id))
+      saleObj      = Sale.find(sale_id)
+      sale_payment = SalePayment.new
+      sale_payment.process_payment(saleObj, @user, cash, "foc")
+
+      unique_code = "ReceiptBillPdf"
+      customer= Customer.find(saleObj.customer_id)
+      
+       #shop detail
+      shop_details = Shop.find(1)
+
+      # get printer info
+      print_settings=PrintSetting.find_by_unique_code(unique_code)
+      # Calculate Food and Beverage Total
+      item_price_by_accounts = SaleItem.calculate_price_by_accounts(saleObj.sale_items)
+      discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(saleObj.sale_items)
+
+      printer = Printer::ReceiptPrinter.new(print_settings)
+      printer.print_receipt_bill(print_settings,saleObj.sale_items,saleObj,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info,rebate_amount,shop_details, "FOC")   
+    end    
+  end
+
   def rounding_adj
 
       saleObj      = Sale.find(params[:sale_id])

app/controllers/origami/shifts_controller.rb

@@ -66,8 +66,6 @@ class Origami::ShiftsController < BaseOrigamiController
       @sale_taxes    = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='')
       #other payment details for mpu or visa like card
       @other_payment = ShiftSale.get_by_shift_other_payment(@shift)
-      #t details for mpu or visa like card
-      @other_payment = ShiftSale.get_by_shift_other_payment(@shift)
 
       # Calculate price_by_accounts
       @total_amount_by_account    = ShiftSale.calculate_total_price_by_accounts(@shift,'amount')

app/controllers/settings/item_sets_controller.rb

@@ -0,0 +1,74 @@
+class Settings::ItemSetsController < ApplicationController
+  before_action :set_settings_item_set, only: [:show, :edit, :update, :destroy]
+
+  # GET /settings/item_sets
+  # GET /settings/item_sets.json
+  def index
+    @settings_item_sets = ItemSet.all
+  end
+
+  # GET /settings/item_sets/1
+  # GET /settings/item_sets/1.json
+  def show
+  end
+
+  # GET /settings/item_sets/new
+  def new
+    @settings_item_set = ItemSet.new    
+  end
+
+  # GET /settings/item_sets/1/edit
+  def edit
+  end
+
+  # POST /settings/item_sets
+  # POST /settings/item_sets.json
+  def create
+    @settings_item_set = ItemSet.new(settings_item_set_params)
+
+    respond_to do |format|
+      if @settings_item_set.save
+        format.html { redirect_to @settings_item_set, notice: 'Item set was successfully created.' }
+        format.json { render :show, status: :created, location: @settings_item_set }
+      else
+        format.html { render :new }
+        format.json { render json: @settings_item_set.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # PATCH/PUT /settings/item_sets/1
+  # PATCH/PUT /settings/item_sets/1.json
+  def update
+    respond_to do |format|
+      if @settings_item_set.update(settings_item_set_params)
+        format.html { redirect_to @settings_item_set, notice: 'Item set was successfully updated.' }
+        format.json { render :show, status: :ok, location: @settings_item_set }
+      else
+        format.html { render :edit }
+        format.json { render json: @settings_item_set.errors, status: :unprocessable_entity }
+      end
+    end
+  end
+
+  # DELETE /settings/item_sets/1
+  # DELETE /settings/item_sets/1.json
+  def destroy
+    @settings_item_set.destroy
+    respond_to do |format|
+      format.html { redirect_to settings_item_sets_url, notice: 'Item set was successfully destroyed.' }
+      format.json { head :no_content }
+    end
+  end
+
+  private
+    # Use callbacks to share common setup or constraints between actions.
+    def set_settings_item_set
+      @settings_item_set = ItemSet.find(params[:id])
+    end
+
+    # Never trust parameters from the scary internet, only allow the white list through.
+    def settings_item_set_params
+      params.require(:settings_item_set).permit(:name, :min_selectable_qty, :max_selectable_qty)
+    end
+end