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

app/controllers/api/bill_controller.rb

@@ -25,25 +25,30 @@ class Api::BillController < Api::ApiController
       @status, @sale_id = @sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier)
     end
 
-    @sale_data = Sale.find_by_sale_id(@sale_id)
-    @sale_items = SaleItem.where("sale_id=?",@sale_id)
+# Not Use for these printed bill cannot give customer
+    # @sale_data = Sale.find_by_sale_id(@sale_id)
+    # @sale_items = SaleItem.where("sale_id=?",@sale_id)
 
-    unique_code = "ReceiptBillPdf"
-    #shop detail
-    shop_details = Shop.find(1)
+    # unique_code = "ReceiptBillPdf"
+    # #shop detail
+    # shop_details = Shop.find(1)
 
-    customer= Customer.find(@sale_data.customer_id)
-    # get member information
-    member_info = Customer.get_member_account(customer)
+    # customer= Customer.find(@sale_data.customer_id)
+    # # get member information
+    # member_info = Customer.get_member_account(customer)
 
-    # get printer info
-    print_settings=PrintSetting.find_by_unique_code(unique_code)
 
-    # Calculate Price by accounts
-    item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items)
+    # # get printer info
+    # print_settings=PrintSetting.find_by_unique_code(unique_code)
+
+    # # Calculate Price by accounts
+    # item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items)
+
+
+    # printer = Printer::ReceiptPrinter.new(print_settings)
+    # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts, member_info, shop_details)
+
 
-    printer = Printer::ReceiptPrinter.new(print_settings)
-    printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts)
   end
 
 

app/controllers/api/orders_controller.rb

@@ -68,8 +68,10 @@ class Api::OrdersController <  Api::ApiController
           if booking.dining_facility_id.to_i == params[:table_id].to_i && booking.booking_status != 'moved'
             if !booking.sale_id.nil?
               sale_status = check_order_with_booking(booking)
+              puts "WWwwWWWWWWww"
+              puts sale_status
               if sale_status
-                return false
+                return false , @message = "bill requested"
               end
             else
               @order.new_booking = false
@@ -77,22 +79,38 @@ class Api::OrdersController <  Api::ApiController
             end
           else
               sale_status = check_order_with_table(params[:table_id])
+              puts "OOOOOOOOO"
+              puts sale_status
               if sale_status
-                return false
+                return false , @message = "bill requested"
               end
           end
         end #booking exists
       else
-        check_order_with_table(params[:table_id])
-       end
+        sale_status = check_order_with_table(params[:table_id])
+        puts "MMMMMMMM"
+        puts sale_status
+        if sale_status
+          return false , @message = "bill requested"
+        end
+      end
 
     @status, @booking = @order.generate
   end
 
+  # render json for http status code 202
+  def return_json_status_with_code(code, msg, booking_id)
+    render status: code, json: {
+      message: msg,
+      booking_id: booking_id
+    }.to_json    
+  end
+
   def check_order_with_table(table_id)
     table =  DiningFacility.find(table_id)
     if table
        booking = table.get_current_booking
+       puts booking
        if booking
          if booking.sale.sale_status == "completed" || booking.sale.sale_status == "billed"
            @order.new_booking = true

app/controllers/home_controller.rb

@@ -2,7 +2,7 @@ class HomeController < ApplicationController
   skip_before_action :authenticate, only: [:index, :show, :create, :update, :destroy]
 
   def index
-    @employees = Employee.all.order("name asc")
+    @employees = Employee.all_emp_except_waiter.order("name asc")
     @login_form = LoginForm.new()
   end
 
@@ -20,7 +20,6 @@ class HomeController < ApplicationController
     if @employee != nil
       session[:session_token] = @employee.token_session
       route_by_role(@employee)
-
     else
       render :show, flash[:notice] => "Invalid PIN for Employee. Please try again!"
     end
@@ -38,7 +37,7 @@ class HomeController < ApplicationController
         redirect_to dashboard_path
       elsif @employee.role == "cashier"
         session[:session_token] = @employee.token_session
-        redirect_to origami_root_path
+        route_by_role(@employee)
       elsif @employee.role == "manager"
         session[:session_token] = @employee.token_session
         redirect_to dashboard_path
@@ -81,13 +80,13 @@ class HomeController < ApplicationController
       redirect_to dashboard_path
     elsif employee.role == "cashier"
       #check if cashier has existing open cashier
-
-      # if !ShiftSale.current_open_shift(employee).nil?
-      #   redirect_to origami_root_path
-      # else
+      shift = ShiftSale.current_open_shift(employee.id)
+      if !shift.nil?
+        redirect_to origami_root_path
+      else
         redirect_to new_origami_shift_path
-      # end
-    elsif employee.role == "checker"
+       end
+    elsif employee.role == "manager"
       redirect_to oqs_root_path
     elsif employee.role == "waiter"
       redirect_to oqs_root_path

app/controllers/origami/cash_ins_controller.rb

@@ -0,0 +1,15 @@
+class Origami::CashInsController < BaseOrigamiController
+
+  def new
+  end
+
+  def create
+    reference = params[:reference]
+    remark = params[:remark]
+    amount = params[:amount]
+    payment_method = params[:payment_method]
+    payment_method_reference = params[:payment_method_reference]
+    p_jour = PaymentJournal.new
+    p_jour.cash_in(reference, remark, amount, payment_method, payment_method_reference, current_user.id)
+  end
+end

app/controllers/origami/cash_outs_controller.rb

@@ -0,0 +1,13 @@
+class Origami::CashOutsController < BaseOrigamiController
+
+  def new
+  end
+
+  def create
+    reference = params[:reference]
+    remark = params[:remark]
+    amount = params[:amount]
+    p_jour = PaymentJournal.new
+    p_jour.cash_out(reference, remark, amount, current_user.id)
+  end
+end

app/controllers/origami/home_controller.rb

@@ -6,6 +6,7 @@ class Origami::HomeController < BaseOrigamiController
     @rooms = Room.all.active.order('status desc')
     @complete = Sale.all
     @orders = Order.all.order('date desc')
+    # @shift = ShiftSale.current_open_shift(current_user.id)
   end
 
  # origami table detail

app/controllers/origami/home_controller_bk.rb

@@ -19,9 +19,9 @@ class Origami::HomeController < BaseOrigamiController
   	@orders = Order.get_orders()
   end
 
-  def item_show
-  	selection(params[:booking_id],1)
-  end
+  # def item_show
+  # 	selection(params[:booking_id],1)
+  # end
 
   def selection(selected_id, is_ajax)
     str = []
@@ -37,8 +37,8 @@ class Origami::HomeController < BaseOrigamiController
       @order_details = OrderItem.get_order_items_details(params[:booking_id])
       @order_details.each do |ord_detail|
         str.push(ord_detail)
-      end    
-    end 
+      end
+    end
 
     if is_ajax == 1
       render :json => str.to_json

app/controllers/origami/payments_controller.rb

@@ -4,6 +4,34 @@ class Origami::PaymentsController < BaseOrigamiController
   def index
   end
 
+  def first_bill
+    sale_id = params[:sale_id] # sale_id
+    sale_data = Sale.find_by_sale_id(sale_id)
+    sale_items = SaleItem.where("sale_id=?",sale_id)
+
+    # Print for First Bill to Customer
+    unique_code = "ReceiptBillPdf"
+     #shop detail
+    shop_details = Shop.find(1)
+    # customer= Customer.where('customer_id=' +.customer_id)
+    customer= Customer.find(sale_data.customer_id)
+    # get member information
+    member_info = Customer.get_member_account(customer)
+    # get printer info
+    print_settings=PrintSetting.find_by_unique_code(unique_code)
+
+    # find order id by sale id
+    # sale_order = SaleOrder.find_by_sale_id(@sale_data.sale_id)
+
+    # Calculate price_by_accounts
+    item_price_by_accounts = SaleItem.calculate_price_by_accounts(sale_items)
+    discount_price_by_accounts = SaleItem.get_discount_price_by_accounts(sale_items)
+
+    printer = Printer::ReceiptPrinter.new(print_settings)
+
+    printer.print_receipt_bill(print_settings,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_details)    
+  end
+
   def create
     cash = params[:cash]
     sale_id = params[:sale_id]
@@ -26,9 +54,10 @@ class Origami::PaymentsController < BaseOrigamiController
       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, member_info,rebate_amount,shop_details)
+      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)
     end
   end
 
@@ -104,10 +133,9 @@ class Origami::PaymentsController < BaseOrigamiController
 
       # Calculate price_by_accounts
       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, member_info,rebate_amount,shop_details)
+      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)
   end
-
-
 end

app/controllers/origami/request_bills_controller.rb

@@ -10,8 +10,8 @@ class Origami::RequestBillsController < BaseOrigamiController
     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"
-      puts current_login_employee.name
+      # puts "current_login_employee"
+      # puts current_login_employee.name
       @status, @sale_id = @sale.generate_invoice_from_booking(check_booking.id,current_login_employee, cashier = nil)
       @sale_data = Sale.find_by_sale_id(@sale_id)
       @sale_items = SaleItem.where("sale_id=?",@sale_id)
@@ -20,26 +20,26 @@ class Origami::RequestBillsController < BaseOrigamiController
       @sale_items = SaleItem.where("sale_id=?",@sale_data.sale_id)
     end
 
-    unique_code = "ReceiptBillPdf"
-     #shop detail
-      shop_details = Shop.find(1)
-    # customer= Customer.where('customer_id=' +.customer_id)
-    customer= Customer.find(@sale_data.customer_id)
-    # get member information
-    member_info = Customer.get_member_account(customer)
-    # get printer info
-    print_settings=PrintSetting.find_by_unique_code(unique_code)
+# Not Use for these printed bill cannot give customer
+    # unique_code = "ReceiptBillPdf"
+    #  #shop detail
+    # shop_details = Shop.find(1)
+    # # customer= Customer.where('customer_id=' +.customer_id)
+    # customer= Customer.find(@sale_data.customer_id)
+    # # get member information
+    # member_info = Customer.get_member_account(customer)
+    # # get printer info
+    # print_settings=PrintSetting.find_by_unique_code(unique_code)
 
-    # find order id by sale id
-    # sale_order = SaleOrder.find_by_sale_id(@sale_data.sale_id)
+    # # find order id by sale id
+    # # sale_order = SaleOrder.find_by_sale_id(@sale_data.sale_id)
 
-    # Calculate price_by_accounts
-    item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items)
+    # # Calculate price_by_accounts
+    # item_price_by_accounts = SaleItem.calculate_price_by_accounts(@sale_items)
 
-    printer = Printer::ReceiptPrinter.new(print_settings)
+    # printer = Printer::ReceiptPrinter.new(print_settings)
 
-    printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info,shop_details)
-    # redirect_to origami_path(@sale_data.sale_id)
 
+    # printer.print_receipt_bill(print_settings,@sale_items,@sale_data,customer.name, item_price_by_accounts,member_info,shop_details)
   end
 end

app/controllers/origami/sale_edit_controller.rb

@@ -18,6 +18,7 @@ class Origami::SaleEditController < BaseOrigamiController
      @newsaleitem.save
      @newsaleitem.qty = saleitemObj.qty * -1
      @newsaleitem.price = saleitemObj.price * -1
+     @newsaleitem.is_taxable = 0
      @newsaleitem.product_name = saleitemObj.product_name + " - void"
      @newsaleitem.save
    end

app/controllers/origami/shifts_controller.rb

@@ -1,11 +1,28 @@
-class Origami::ShiftsController < ApplicationController
+class Origami::ShiftsController < BaseOrigamiController
+
   def index
   end
 
   def show
+    @shift = ShiftSale.current_open_shift(current_user.id)
   end
 
   def new
+    @float = Lookup.where('lookup_type=?','float_value')
+  end
+
+  def create
+    opening_balance = params[:opening_balance]
+    @shift = ShiftSale.new
+    @shift.create(opening_balance,current_user)
+  end
+
+  def update_shift
+    @shift = ShiftSale.current_open_shift(current_user.id)
+    if @shift
+      @shift.shift_closed_at = DateTime.now.utc
+      @shift.save
+    end
   end
 
   def edit