Merge branch 'master' into august_spring

app/controllers/origami/addorders_controller.rb

@@ -0,0 +1,22 @@
+class Origami::AddordersController < BaseOrigamiController
+  before_action :set_dining, only: [:show]
+
+  def index
+      @tables = Table.all.active.order('zone_id asc').group("zone_id")
+      @rooms = Room.all.active.order('zone_id asc').group("zone_id")
+      @all_table = Table.all.active.order('status desc')
+      @all_room = Room.all.active.order('status desc')
+  end
+
+  def show
+  	@menu = MenuCategory.all
+    @table_id = params[:id]
+  end
+  
+  private
+
+  def set_dining
+     @dining = DiningFacility.find(params[:id])
+  end
+
+end

app/controllers/origami/customers_controller.rb

@@ -37,14 +37,14 @@ class Origami::CustomersController < BaseOrigamiController
       @crm_customers = Customer.order("customer_id").page(params[:page])
       #@products = Product.order("name").page(params[:page]).per(5)
     else
-      @crm_customers = Customer.search(filter) 
-      
+      @crm_customers = Customer.search(filter)       
     end
     #@crm_customers  = Customer.all
     @crm_customers   = Kaminari.paginate_array(@crm_customers).page(params[:page]).per(50)
     @crm_customer    = Customer.new
     @count_customer = Customer.count_customer
     
+    @taxes = TaxProfile.all.order("order_by asc")
     # if flash["errors"]
     #   @crm_customer.valid?
     # end
@@ -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,13 +83,15 @@ 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
 
     if status == true
         render json: JSON.generate({:status => true})
+        # Re-calc All Amount in Sale
+        sale.compute_by_sale_items(sale.sale_id, sale.sale_items, sale.total_discount) 
     else
         render json: JSON.generate({:status => false, :error_message => "Record not found"})
     end

app/controllers/origami/home_controller.rb

@@ -2,10 +2,12 @@ class Origami::HomeController < BaseOrigamiController
  before_action :set_dining, only: [:show]
 
   def index
-    @tables = Table.all.active.order('status desc')
-    @rooms = Room.all.active.order('status desc')
+    @tables   = Table.all.active.order('status desc')
+    @rooms    = Room.all.active.order('status desc')
     @complete = Sale.where("sale_status != 'new'")
-    @orders = Order.all.order('date desc')
+    @orders   = Order.all.order('date desc')
+    @shop     = Shop.find_by_id(1)
+
     # @shift = ShiftSale.current_open_shift(current_user.id)
   end
 
@@ -38,7 +40,6 @@ class Origami::HomeController < BaseOrigamiController
          else
           sale = Sale.find(booking.sale_id)
            if sale.sale_status != "completed" && sale.sale_status != 'void'
-             puts "enter"
              @sale_array.push(sale)
              if @status_order == 'order'
                @status_order = 'sale'

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

@@ -31,15 +31,21 @@ class Origami::ShiftsController < BaseOrigamiController
       unique_code = "CloseCashierPdf"
       shop_details = Shop.find(1)
       #get tax
-      shift_obj = ShiftSale.where('id =?',@shift.id)
-      @sale_taxes = Sale.get_separate_tax(shift_obj,from=nil,to=nil,type='')
-   
+      shift_obj      = ShiftSale.where('id =?',@shift.id)
+      @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)
+
+      # Calculate price_by_accounts
+      @total_amount_by_account    = ShiftSale.calculate_total_price_by_accounts(@shift,'amount')
+      @total_discount_by_account  = ShiftSale.calculate_total_price_by_accounts(@shift,'discount')
+      @total_member_discount      = ShiftSale.get_total_member_discount(@shift)
       # get printer info
-      print_settings=PrintSetting.find_by_unique_code(unique_code)
+      print_settings = PrintSetting.find_by_unique_code(unique_code)
 
       printer = Printer::CashierStationPrinter.new(print_settings)
 
-      printer.print_close_cashier(print_settings,@shift,shop_details,@sale_taxes)
+      printer.print_close_cashier(print_settings,@shift,shop_details,@sale_taxes,@other_payment,@total_amount_by_account,@total_discount_by_account,@total_member_discount)
 
       
     end
@@ -52,6 +58,21 @@ class Origami::ShiftsController < BaseOrigamiController
 
   def sale_summary
     @shift = ShiftSale.current_open_shift(current_user.id)
+
+    # @shift = ShiftSale.find_by_id(shift_id)
+    if @shift
+      #get tax
+      shift_obj      = ShiftSale.where('id =?',@shift.id)
+      @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)
+
+      # Calculate price_by_accounts
+      @total_amount_by_account    = ShiftSale.calculate_total_price_by_accounts(@shift,'amount')
+      @total_discount_by_account  = ShiftSale.calculate_total_price_by_accounts(@shift,'discount')
+      @total_member_discount = ShiftSale.get_total_member_discount(@shift)
+
+    end
     
   end
 

app/controllers/origami/void_controller.rb

@@ -6,18 +6,19 @@ class Origami::VoidController < BaseOrigamiController
 
     if Sale.exists?(sale_id)
       sale = Sale.find_by_sale_id(sale_id)
-      sale.payment_status = 'void'
-      sale.sale_status = 'void'
-      sale.save
-
+      
       # update count for shift sale
-      if(sale.sale_status == "void")
+      if(sale.sale_status == "completed")
         if sale.shift_sale_id != nil
           shift = ShiftSale.find(sale.shift_sale_id)
           shift.calculate(sale_id, "void")
         end
       end
 
+      sale.payment_status = 'void'
+      sale.sale_status = 'void'
+      sale.save
+
       bookings = sale.bookings
       bookings.each do |booking|
         orders = booking.orders